diff --git a/stella/docs/graphics/eventmapping.png b/stella/docs/graphics/eventmapping.png index b1f5dd4b8..09c2b205e 100644 Binary files a/stella/docs/graphics/eventmapping.png and b/stella/docs/graphics/eventmapping.png differ diff --git a/stella/docs/graphics/eventmapping_remap.png b/stella/docs/graphics/eventmapping_remap.png index a299489c2..97629249b 100644 Binary files a/stella/docs/graphics/eventmapping_remap.png and b/stella/docs/graphics/eventmapping_remap.png differ diff --git a/stella/docs/graphics/eventmapping_virtualdevs.png b/stella/docs/graphics/eventmapping_virtualdevs.png index 33114774b..c6aea292e 100644 Binary files a/stella/docs/graphics/eventmapping_virtualdevs.png and b/stella/docs/graphics/eventmapping_virtualdevs.png differ diff --git a/stella/docs/graphics/launcher.png b/stella/docs/graphics/launcher.png index 92e646e5a..38e630018 100644 Binary files a/stella/docs/graphics/launcher.png and b/stella/docs/graphics/launcher.png differ diff --git a/stella/docs/graphics/launcher_options_files.png b/stella/docs/graphics/launcher_options_files.png index 6d46f5002..852752908 100644 Binary files a/stella/docs/graphics/launcher_options_files.png and b/stella/docs/graphics/launcher_options_files.png differ diff --git a/stella/docs/graphics/options.png b/stella/docs/graphics/options.png index 1e5afe711..1a07a880b 100644 Binary files a/stella/docs/graphics/options.png and b/stella/docs/graphics/options.png differ diff --git a/stella/docs/graphics/options_about.png b/stella/docs/graphics/options_about.png index bb539d004..6237309dc 100644 Binary files a/stella/docs/graphics/options_about.png and b/stella/docs/graphics/options_about.png differ diff --git a/stella/docs/graphics/options_audio.png b/stella/docs/graphics/options_audio.png index 174046083..dfcc578c0 100644 Binary files a/stella/docs/graphics/options_audio.png and b/stella/docs/graphics/options_audio.png differ diff --git a/stella/docs/graphics/options_gameinfo.png b/stella/docs/graphics/options_gameinfo.png index f725360b9..974840183 100644 Binary files a/stella/docs/graphics/options_gameinfo.png and b/stella/docs/graphics/options_gameinfo.png differ diff --git a/stella/docs/graphics/options_help.png b/stella/docs/graphics/options_help.png index e1783258e..ba94e3d25 100644 Binary files a/stella/docs/graphics/options_help.png and b/stella/docs/graphics/options_help.png differ diff --git a/stella/docs/graphics/options_input.png b/stella/docs/graphics/options_input.png new file mode 100644 index 000000000..4bd511614 Binary files /dev/null and b/stella/docs/graphics/options_input.png differ diff --git a/stella/docs/graphics/options_romaudit.png b/stella/docs/graphics/options_romaudit.png new file mode 100644 index 000000000..c95ef40c7 Binary files /dev/null and b/stella/docs/graphics/options_romaudit.png differ diff --git a/stella/docs/graphics/options_ui.png b/stella/docs/graphics/options_ui.png new file mode 100644 index 000000000..5e7c8d372 Binary files /dev/null and b/stella/docs/graphics/options_ui.png differ diff --git a/stella/docs/graphics/options_video.png b/stella/docs/graphics/options_video.png index 4820ac9c7..c44e5bb89 100644 Binary files a/stella/docs/graphics/options_video.png and b/stella/docs/graphics/options_video.png differ diff --git a/stella/docs/graphics/rom_browser.png b/stella/docs/graphics/rom_browser.png index 84f8edd21..8793ba680 100644 Binary files a/stella/docs/graphics/rom_browser.png and b/stella/docs/graphics/rom_browser.png differ diff --git a/stella/docs/index.html b/stella/docs/index.html index dbbbd5889..56591361a 100644 --- a/stella/docs/index.html +++ b/stella/docs/index.html @@ -10,7 +10,7 @@

A multi-platform Atari 2600 VCS emulator

-

Release 2.4.1

+

Release 2.5



User's Guide

@@ -25,6 +25,8 @@
  • Changing Options
  • Keyboard Layout
  • Event Remapping
    • +
  • Viewing ROM Info
    • +
  • ROM Audit Mode
  • Stelladaptor Support
  • Integrated Debugger
  • Settings File
    • @@ -37,7 +39,7 @@


    -
    February 1999 - August 2007
    +
    February 1999 - March 2008
    The Stella Team
    Stella Homepage
    @@ -218,14 +220,101 @@ Sega Dreamcast, Unix, and Windows.

    -

    New in Release 2.4.1

    +

    New in Release 2.5

    @@ -238,30 +327,20 @@

  • Emulates the Atari 2600 Joystick Controllers using your computer's keyboard or joysticks
  • Emulates the Atari 2600 Keyboard Controllers using your computer's keyboard
    • -
  • Emulates one Atari 2600 Paddle Controller using your computer's mouse
    • -
  • Support for real Atari 2600 controllers using the - Stelladaptor
    • +
  • Emulates one Atari 2600 Paddle Controller using your computer's mouse, keyboard + or joysticks
  • Emulates the Atari 2600 Driving Controllers using your computer's keyboard or joysticks
  • Emulates the CBS Booster-Grip Controller using your computer's keyboard or joysticks
    • -
  • Supports cartridges using Atari's standard 2K and 4K format
    • -
  • Supports cartridges using Atari's 8K, 16K, and 32K bank-switching schemes
    • -
  • Supports cartridges using Activision's 8K bank-switching scheme - (Robot Tank and Decathlon)
    • -
  • Supports cartridges using CBS Electronics' 12K bank-switching scheme
    • -
  • Supports cartridges using Chris Wilkson's Megacart 128K bank-switching - scheme
    • -
  • Supports cartridges using Commavid bank-switching scheme
    • -
  • Supports cartridges using M-Network's 16K bank-switching scheme
    • -
  • Supports cartridges using Parker Brothers' 8K bank-switching scheme
    • -
  • Supports cartridges using Tigervision's bank-switching scheme with up to - 512K ROM
    • -
  • Supports cartridges using UA Limited bank-switching scheme
    • +
  • Support for real Atari 2600 controllers using the + Stelladaptor
    • +
  • Supports almost all known bankswitching schemes (let us know if there's one we missed)
    • +
  • Supports cartridge autodetection for almost all bankswitching schemes
  • Supports Supercharger single-load and multi-load games
  • Supports property file for setting the properties associated with games
    • - -
  • Supports the NTSC, PAL, PAL60 and SECAM television standards
    • +
  • Supports the NTSC, PAL, PAL and SECAM television standards in 50Hz and 60Hz mode
    • +
  • Supports autodetection of display format for 50Hz vs. 60Hz modes
  • Supports several "undocumented features" of the TIA graphics chip used by some games
  • TIA emulation supports full collision checking
    • @@ -303,7 +382,8 @@
  • GNU C++ compiler version 2.95 and the make utility are required for compiling the Stella source code; GNU C++ compiler version 3.2.x/4.x or later is highly recommended
    • -
  • x86 or PowerPC class machine, in either 32 or 64-bit mode
    • +
  • i386, x86_64 or PowerPC class machine, in either 32 or 64-bit mode
    • +
  • Other architectures (MIPS, PPC64, etc) have been confirmed to work as well

    • @@ -326,12 +406,21 @@ with the following:

    +

    +

    Other

    + +

    Stella is extremely portable, and in its lifetime has been ported to almost every + platform known. It is 32/64 bit clean in Linux/Unix and Windows (Win32/Win64), and + is expected to be compatible with 64-bit OSX as well. The Stella team is interested + in hearing about any problems you may encounter with diverse operating systems and + CPU types.

    +

    @@ -509,7 +598,7 @@

    You can start emulation by selecting a ROM and pressing 'Enter' or - clicking 'Play', or double-clicking a ROM.

    + clicking 'Select', or double-clicking a ROM.

    Command Line

    @@ -569,6 +658,12 @@ period. This can result in smoother updates, and eliminate tearing. + + 
    -gl_texrect <0|1>
    + OpenGL mode only. Enable GL_TEXTURE_RECTANGLE extension. This causes + problems for some people using ATI video cards. + + 
    -zoom_tia <scaler>
    Use the specified zoom level while in TIA/emulation mode. @@ -622,15 +717,11 @@ Enable or disable sound generation. - - 
    -channels <1|2>
    - Enable mono or stereo sound. - - 
    -fragsize <number>
    Specify the sound fragment size to use. Linux/Mac seems to work - with 512, Windows may need 2048. + with 512, Windows may need 2048 (but newer versions work with + 512 as well). @@ -666,8 +757,8 @@ - 
    -paddle <0|1|2|3>
    - Indicates which paddle the mouse should emulate (defaults to paddle 0). + 
    -pspeed <number>
    + Speed of digital emulation for paddles (1-15). @@ -681,33 +772,8 @@ - 
    -p0speed <number>
    - Speed of digital emulation for paddle 0 (0-100). - - - - 
    -p1speed <number>
    - Speed of digital emulation for paddle 1 (0-100). - - - - 
    -p2speed <number>
    - Speed of digital emulation for paddle 2 (0-100). - - - - 
    -p3speed <number>
    - Speed of digital emulation for paddle 3 (0-100). - - - - 
    -pthresh <number>
    - Set threshold for eliminating paddle jitter. - - - - 
    -rombrowse <1|0>
    - Use browser mode (shows files and folders) in ROM launcher. + 
    -romviewer <1|0>
    + Show/hide ROM info viewer in ROM launcher mode. @@ -743,6 +809,11 @@ Set the size of the ROM launcher. + + 
    -launcherfont <small|large>
    + Set the size of the font in the ROM launcher. + + 
    -uipalette <1|2>
    Used the specified palette for UI elements. This isn't yet @@ -822,11 +893,21 @@ - 
    -type <type>
    + 
    -tiafloat <1|0>
    + Set unused TIA pins to be floating on a read/peek. + + + + 
    -bs <type>
    Set "Cartridge.Type" property. See the Game Properties section for valid types. + + 
    -type <type>
    + Same as using -bs. + + 
    -channels <Mono|Stereo>
    Set "Cartridge.Sound" property. @@ -876,8 +957,9 @@ - 
    -format <NTSC|PAL|PAL60|SECAM>
    - Set "Display.Format" property. + 
    -format <format>
    + Set "Display.Format" property. See the Game Properties section + for valid formats. @@ -922,18 +1004,47 @@

    Options Menu dialog:

    +


    -

    Video Options dialog:

    +

    Video Settings dialog:

    +


    -

    Audio Options dialog:

    +

    Audio Settings dialog:

    +


    + +

    Input Settings dialog:

    + +

    This dialog is described in further detail in Section 8 - + Event Remapping. +


    + +

    UI Settings dialog:

    + +

    All UI related items can be changed here. Such items include the width and + height of the ROM launcher and debugger windows, etc. Note that most of the items + here require Stella to be restarted to take effect. Specific information about + the ROM Info functionality is described in further detail in Section 9 - + Viewing ROM Info. + +


    + +

    Audit ROMs dialog:

    + +

    This dialog is described in further detail in Section 10 - + ROM Audit Mode. +


    Game Information dialog:

    +

    This dialog allows you to change all ROM properties as described in + Section 15 - Game Properties. +


    Help dialog:

    +


    About dialog:

    @@ -1596,7 +1707,7 @@ - Emulate 'frying' effect + Emulate 'frying' effect (*) Backspace Backspace @@ -1656,7 +1767,6 @@

    The following screenshots illustrate the event remapping process:

    -

    Virtual devices can be configured under the 'Virtual Devs' tab, shown below:

    @@ -1666,28 +1776,43 @@ ports. See the section 'Stelladaptor Support' for more information.

    Paddle settings are also configured here. The mouse can emulate either paddle - 0, 1, 2, or 3. Note that for games which don't normally default to paddle 0, - their ROM properties take care of that remapping. So, for example, a ROM that - defaults to paddle 1 (Demons to Diamonds) will use paddle 0, as will a ROM - that defaults to paddle 3 (Tac-Scan). So you never have to worry which paddle - a ROM will use; it will always default to paddle 0.

    + 0, 1, 2, or 3. Note that some paddle games don't default to paddle 0. In those + cases, the ROM properties will automatically set the mouse to emulate the paddle + used by Player 0. So, for example, a ROM that defaults to paddle 1 (Demons to Diamonds) + will set 'Mouse is paddle' to 1, and a ROM that defaults to paddle 3 (Tac-Scan) will + set 'Mouse is paddle' to 3.

    -

    Paddle threshold is used to eliminate 'jitter', whereby the onscreen paddle - object seems to move slightly even when no input is present. It specifies the amount - by which a paddle input has to move before it's considered a real event. Hence, - it eliminates small movements (default of 600).

    - -

    Paddle x speed is used when emulating a paddle using a digital device +

    Paddle speed is used when emulating a paddle using a digital device (keyboard, digital joystick, etc). Because of the on/off nature of digital devices, there are no smooth analog values as would be present on a real paddle. When using digital devices, the paddle is moved a certain amount - each frame. These speeds specify how much movement will occur.

    + each frame. This speed setting specifies how much movement will occur.

    + + + +


    +

    + 9. Viewing ROM Info

    +
    + +

    +

    + + + +


    +

    + 10. ROM Audit Mode

    +
    + +

    +



    - 9. Stelladaptor Support

    + 11. Stelladaptor Support

    Stella supports real Atari 2600 joysticks, paddles and driving controllers @@ -1719,7 +1844,7 @@

    - 10. Integrated Debugger

    + 12. Integrated Debugger

    Have a look at this page for integrated debugger @@ -1729,7 +1854,7 @@

    - 11. Settings File

    + 13. Settings File

    Stella will remember when you change a setting either at the command line @@ -1784,7 +1909,8 @@ Windows - stella.ini (in same directory as the application) + %MY_DOCUMENTS%\Stella\stella.ini   OR
    + %CURRENT_DIR%\stella.ini (if a file named 'disable_profiles.txt' exists in the application directory) @@ -1792,7 +1918,7 @@

    - 12. Cheatcode Manager

    + 14. Cheatcode Manager

    Stella 2.0 contains support for Bob Colbert's Cheetah cheat codes, as @@ -1881,7 +2007,8 @@ Ms Pac-Man (Stella extended codes): Windows - stella.cht (in same directory as the application) + %MY_DOCUMENTS%\Stella\stella.cht   OR
    + %CURRENT_DIR%\stella.cht (if a file named 'disable_profiles.txt' exists in the application directory)

    Stella will require a restart for changes to this file to take effect.

    @@ -1890,7 +2017,7 @@ Ms Pac-Man (Stella extended codes):

    - 13. Game Properties

    + 15. Game Properties

    Stella uses game properties to specify the "best" emulator settings for a @@ -1938,7 +2065,7 @@ Ms Pac-Man (Stella extended codes): - - + - + - + - + - + - + sound. The value must be Mono or Stereo. - + + - + - + - + - + The value must be Yes or No. - + - + - + 'Console.SwapPorts'. The value must be Yes or No. - + - + - + - + - + - - + +
    Cartridge.MD5:This property indicates the MD5 checksum of the ROM image as a + Indicates the MD5 checksum of the ROM image as a string of hexadecimal digits. Stella uses this property while attempting to match a game with its block of properties. If the value of the property matches the MD5 checksum of the ROM image then @@ -1949,140 +2076,159 @@ Ms Pac-Man (Stella extended codes):
    Cartridge.Manufacturer:This property indicates the game's manufacturer. Currently this - property is not being used, however, future versions of Stella will - probably allow the user to view this information.Indicates the game's manufacturer.
    Cartridge.ModelNo:This property indicates the manufacturer's model number for the - game. Currently this property is not being used, however, future - versions of Stella will probably allow the user to view this information.Indicates the manufacturer's model number for the game.
    Cartridge.Name:This property indicates the actual name of the game.Indicates the actual name of the game.
    Cartridge.Note:This property contains any special notes about playing the game.Contains any special notes about playing the game.
    Cartridge.Rarity:This property indicates how rare a cartridge is, based on the scale - described on AtariAge.Indicates how rare a cartridge is, based on the scale described on AtariAge.
    Cartridge.Sound:This property determines if the game should use 1 or 2 channels for - sound output. All original Atari 2600 machines supported 1 channel only, + Indicates if the game should use 1 or 2 channels for sound output. + All original Atari 2600 machines supported 1 channel only, but some homebrew games have been written to take advantage of stereo - sound. The value of this property must be Mono or Stereo.
    Cartridge.Type:This property indicates the bank-switching type for the game. - The value of this property must be: Auto-detect, 2K, 3E, 3F, 4K, AR, - CV, DPC, E0, E7, F4, F4SC, F6, F6SC, F8, F8SC, FASC, FE, MB, MC or UA. - For more information about bank-switching see Kevin Horton's 2600 - bank-switching document.Indicates the bank-switching type for the game. + The value of this property must be either Auto-detect or one of the following + (for more information about bank-switching see Kevin Horton's 2600 bankswitching + document or the documentation in each cartridges source code file): + + + + + + + + + + + + + + + + + + + + + + + + + + +
     Type Description
    0840 8K ECONObanking
    2K 2K Atari
    3E 32K Tigervision
    3F 512K Tigervision
    4A50 64K 4A50 + ram
    4K 4K Atari
    AR Supercharger
    CV Commavid extra ram
    DPC Pitfall II
    E0 8K Parker Bros
    E7 16K M-network
    F4 32K Atari
    F4SC 32K Atari + ram
    F6 16K Atari
    F6SC 16K Atari + ram
    F8 8K Atari
    F8SC 8K Atari + ram
    FASC CBS RAM Plus
    FE 8K Decathlon
    MB Dynacom Megaboy
    MC C. Wilkson Megacart
    SB 128-256k SUPERbanking
    UA 8K UA Ltd.
    X07 64K AtariAge
    Console.LeftDifficulty:This property indicates the default difficulty setting for the left - player. The value of this property must be A or B.Indicates the default difficulty setting for the left + player. The value must be A or B.
    Console.RightDifficulty:This property indicates the default difficulty setting for the - right player. The value of this property must be A or B.Indicates the default difficulty setting for the + right player. The value must be A or B.
    Console.TelevisionType:This property indicates the default television setting for the - game. The value of this property must be Color or BlankAndWhite.Indicates the default television setting for the + game. The value must be Color or BlankAndWhite.
    Console.SwapPorts:This property indicates that the left and right ports should be + Indicates that the left and right ports should be swapped internally. This is used for ROMs like 'Raiders' where the Player 0 joystick is plugged into the right joystick port. - The value of this property must be Yes or No.
    Controller.Left:This property indicates what type of controller the left player - uses. The value of this property must be Booster-Grip, Driving, - Keyboard, Paddles, or Joystick.Indicates what type of controller the left player + uses. The value must be Booster-Grip, Driving, + Keyboard, Paddles, or Joystick.
    Controller.Right:This property indicates what type of controller the right player - uses. The value of this property must be Booster-Grip, Driving, - Keyboard, Paddles, or Joystick.Indicates what type of controller the right player + uses. The value must be Booster-Grip, Driving, + Keyboard, Paddles, or Joystick.
    Controller.SwapPaddles:This property indicates that the left and right paddles in + Indicates that the left and right paddles in a particular port should be swapped. This is used for ROMs like 'Demons to Diamonds' where the default paddle is paddle 1, not paddle 0. Other ROMs such as 'Tac-Scan' default to paddle 3, which can be set using both 'Controller.SwapPaddles' and - 'Console.SwapPorts'. The value of this property must be Yes or No.
    Display.Format:This property indicates the television format the game was - designed for. The value of this property must be Auto-detect, NTSC, - PAL or PAL60.Indicates the television format the game was designed for. The value + must be Auto-detect, NTSC, PAL, SECAM, NTSC50, + PAL60 or SECAM60.
    Display.YStart:This property indicates the scan-line to start displaying at. - The value of this property must be n such that - 0 <= n <= 64.Indicates the scan-line to start displaying at. + The value must be n such that 0 <= n <= 64.
    Display.Height:This property indicates the number of scan-lines to display. - The value of this property must be n such that - 100 <= n <= 256.Indicates the number of scan-lines to display. + The value must be n such that 100 <= n <= 256.
    Display.Phosphor:This property indicates whether the phosphor effect should be - emulated or not. The value of this property must be Yes or No.Indicates whether the phosphor effect should be emulated or not. + The value must be Yes or No.
    Display.PPBlend:This property indicates the amount of blending which will occur - while using the phosphor effect. The value of this property must be - n such that 0 <= n <= 100. The default value - is 77.Indicates the amount of blending which will occur while using the + phosphor effect. The value must be n such that 0 <= n + <= 100. The default value is 77.
    Emulation.HmoveBlanks:This property indicates whether the TIA HMOVE blank bug should be - emulated or not. The value of this property must be Yes or No.Emulation.HmoveBlanks: (*)Indicates whether the TIA HMOVE blank bug should be emulated or not. + The value must be Yes or No.
    @@ -2106,7 +2252,8 @@ Ms Pac-Man (Stella extended codes): Windows - stella.pro (in same directory as the application) + %MY_DOCUMENTS%\Stella\stella.pro   OR
    + %CURRENT_DIR%\stella.pro (if a file named 'disable_profiles.txt' exists in the application directory)

    Stella will require a restart for changes to this file to take effect.

    @@ -2115,11 +2262,11 @@ Ms Pac-Man (Stella extended codes):

    - 14. Palette Support

    + 16. Palette Support

    An Atari 2600 palette consists of 128 colours, which are different - for the three major television standards (NTSC, PAL/PAL60, SECAM). + for the three major television standards (NTSC, PAL, SECAM). Stella supports two built-in palettes and one user-defined palette for each format. These are set using the '-palette' option, and are described as follows:

    @@ -2144,7 +2291,7 @@ Ms Pac-Man (Stella extended codes): in 24-bit RGB, with the first byte for red, the second for green, the third for blue, for a total of 3 bytes per colour.
  • The first 384 bytes of the file (128 * 3) will be used for the NTSC - palette. The next 384 bytes (128 * 3) will be for the PAL/PAL60 palette. + palette. The next 384 bytes (128 * 3) will be for the PAL palette. The next 24 bytes (8 * 3) will be for the SECAM palette, which consists of eight distinct colours. Any extra data in the file will be ignored.
    • @@ -2169,11 +2316,12 @@ Ms Pac-Man (Stella extended codes): - +
    Windowsstella.pal (in same directory as the application)%MY_DOCUMENTS%\Stella\stella.pal   OR
    + %CURRENT_DIR%\stella.pal (if a file named 'disable_profiles.txt' exists in the application directory)

    Note that to actually use the external palette, the palette file must - exist and be valid, and the palette should be set to user. + exist and be valid, and the palette option should be set to user. The current ROM will have to be reloaded for changes to this file to take effect.

    @@ -2181,7 +2329,7 @@ Ms Pac-Man (Stella extended codes):

    - 15. Acknowledgments

    + 17. Acknowledgments

    Bradford W. Mott started developing Stella during the fall of 1995 and since @@ -2372,8 +2520,8 @@ Ms Pac-Man (Stella extended codes): Provided a description of the TIA bug that produces the star field effect in Cosmic Ark, provided the PAL television palette, and participated in a helpful discussion on understanding the TIA's RESPx - multi-sprite trick. He also provided the Commavid and Megaboy support - for Stella as well as some improved Supercharger BIOS code. + multi-sprite trick. Provided the Commavid, Megaboy, 4A50 and X07 support + for Stella as well as some improved Supercharger BIOS code. @@ -2421,6 +2569,12 @@ Ms Pac-Man (Stella extended codes): Provided technical data sheet for the 6532 RIOT chip + + Albert Yarusso (aka Al from AtariAge) + Provided helpful feedback for the OSX port, and generously + donated an AtariVox device to help with development + + Alex Zaballa Maintainer of the GP2X version of Stella starting with the 2.1 release @@ -2432,7 +2586,7 @@ Ms Pac-Man (Stella extended codes):

    - 16. License and Disclaimer

    + 18. License and Disclaimer

    diff --git a/stella/src/emucore/Settings.cxx b/stella/src/emucore/Settings.cxx index bb4f53cc3..7e978848e 100644 --- a/stella/src/emucore/Settings.cxx +++ b/stella/src/emucore/Settings.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: Settings.cxx,v 1.137 2008-03-23 16:22:40 stephena Exp $ +// $Id: Settings.cxx,v 1.138 2008-03-26 00:52:05 stephena Exp $ //============================================================================ #include @@ -69,7 +69,6 @@ Settings::Settings(OSystem* osystem) setInternal("joymap", ""); setInternal("joyaxismap", ""); setInternal("joyhatmap", ""); - setInternal("paddle", "0"); setInternal("pspeed", "6"); setInternal("sa1", "left"); setInternal("sa2", "right"); @@ -86,11 +85,11 @@ Settings::Settings(OSystem* osystem) setInternal("propsfile", ""); // ROM browser options + setInternal("launcherres", "640x480"); + setInternal("launcherfont", "small"); setInternal("romviewer", "false"); // UI-related options - setInternal("launcherres", "640x480"); - setInternal("launcherfont", "small"); setInternal("debuggerres", "1030x690"); setInternal("uipalette", "0"); setInternal("mwheel", "4"); diff --git a/stella/src/gui/GameInfoDialog.cxx b/stella/src/gui/GameInfoDialog.cxx index fe018bf32..4b71365c0 100644 --- a/stella/src/gui/GameInfoDialog.cxx +++ b/stella/src/gui/GameInfoDialog.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: GameInfoDialog.cxx,v 1.51 2008-03-22 17:35:03 stephena Exp $ +// $Id: GameInfoDialog.cxx,v 1.52 2008-03-26 00:52:05 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -41,9 +41,10 @@ GameInfoDialog::GameInfoDialog( myPropertiesLoaded(false), myDefaultsSelected(false) { - const int fontHeight = font.getFontHeight(), - lineHeight = font.getLineHeight(); - + const int lineHeight = font.getLineHeight(), + fontHeight = font.getFontHeight(), + buttonWidth = font.getStringWidth("Defaults") + 20, + buttonHeight = font.getLineHeight() + 4; const int vBorder = 4; int xpos, ypos, lwidth, fwidth, pwidth, tabID; unsigned int i; @@ -179,15 +180,17 @@ GameInfoDialog::GameInfoDialog( myP0Controller->appendEntry(ourControllerList[i][0], i+1); wid.push_back(myP0Controller); - myLeftPort = - new PopUpWidget(myTab, font, xpos+lwidth+myP0Controller->getWidth()+4, ypos, - pwidth, lineHeight, "in ", font.getStringWidth("in "), - kLeftCChanged); + xpos += lwidth+myP0Controller->getWidth() + 4; + new StaticTextWidget(myTab, font, xpos, ypos+1, font.getStringWidth("in "), + fontHeight, "in ", kTextAlignLeft); + xpos += font.getStringWidth("in "); + myLeftPort = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, + "", 0, kLeftCChanged); myLeftPort->appendEntry("left port", 1); myLeftPort->appendEntry("right port", 2); wid.push_back(myLeftPort); - ypos += lineHeight + 5; + xpos = 10; ypos += lineHeight + 5; new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, "P1 Controller:", kTextAlignLeft); myP1Controller = new PopUpWidget(myTab, font, xpos+lwidth, ypos, @@ -196,15 +199,17 @@ GameInfoDialog::GameInfoDialog( myP1Controller->appendEntry(ourControllerList[i][0], i+1); wid.push_back(myP1Controller); - myRightPort = - new PopUpWidget(myTab, font, xpos+lwidth+myP1Controller->getWidth()+4, ypos, - pwidth, lineHeight, "in ", font.getStringWidth("in "), - kRightCChanged); + xpos += lwidth+myP1Controller->getWidth() + 4; + new StaticTextWidget(myTab, font, xpos, ypos+1, font.getStringWidth("in "), + fontHeight, "in ", kTextAlignLeft); + xpos += font.getStringWidth("in "); + myRightPort = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, + "", 0, kRightCChanged); myRightPort->appendEntry("left port", 1); myRightPort->appendEntry("right port", 2); wid.push_back(myRightPort); - ypos += lineHeight + 5; + xpos = 10; ypos += lineHeight + 5; pwidth = font.getStringWidth("Yes"); new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, "Swap Paddles:", kTextAlignLeft); @@ -300,27 +305,12 @@ GameInfoDialog::GameInfoDialog( kTextAlignLeft); // Add Defaults, OK and Cancel buttons - ButtonWidget* b; wid.clear(); - b = addButton(font, 10, _h - 24, "Defaults", kDefaultsCmd); + ButtonWidget* b; + b = new ButtonWidget(this, font, 10, _h - buttonHeight - 10, + buttonWidth, buttonHeight, "Defaults", kDefaultsCmd); wid.push_back(b); -#ifndef MAC_OSX - b = addButton(font, _w - 2 * (kButtonWidth + 7), _h - 24, "OK", kOKCmd); - wid.push_back(b); - addOKWidget(b); - myCancelButton = - addButton(font, _w - (kButtonWidth + 10), _h - 24, "Cancel", kCloseCmd); - wid.push_back(myCancelButton); - addCancelWidget(myCancelButton); -#else - myCancelButton = - addButton(font, _w - 2 * (kButtonWidth + 7), _h - 24, "Cancel", kCloseCmd); - wid.push_back(myCancelButton); - addCancelWidget(myCancelButton); - b = addButton(font, _w - (kButtonWidth + 10), _h - 24, "OK", kOKCmd); - wid.push_back(b); - addOKWidget(b); -#endif + addOKCancelBGroup(wid, font); addBGroupToFocusList(wid); } diff --git a/stella/src/macosx/Info-StellaOSX__Upgraded_.plist b/stella/src/macosx/Info-StellaOSX__Upgraded_.plist index 966f489e2..4bf7a66e7 100644 --- a/stella/src/macosx/Info-StellaOSX__Upgraded_.plist +++ b/stella/src/macosx/Info-StellaOSX__Upgraded_.plist @@ -33,7 +33,7 @@ CFBundleExecutable StellaOSX CFBundleGetInfoString - StellaOSX 2.4.1 + StellaOSX 2.5 CFBundleHelpBookFolder docs CFBundleHelpBookName @@ -45,13 +45,13 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - StellaOSX 2.4.1 + StellaOSX 2.5 CFBundlePackageType APPL CFBundleSignature StLa CFBundleVersion - StellaOSX 2.4.1 + StellaOSX 2.5 NSMainNibFile SDLMain.nib NSPrincipalClass diff --git a/stella/src/unix/stella.SlackBuild b/stella/src/unix/stella.SlackBuild index 2ca03f6de..b1148845b 100644 --- a/stella/src/unix/stella.SlackBuild +++ b/stella/src/unix/stella.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# $Id: stella.SlackBuild,v 1.8 2007-08-27 13:58:42 stephena Exp $ +# $Id: stella.SlackBuild,v 1.9 2008-03-26 00:52:05 stephena Exp $ # stella.SlackBuild for Stella 2.x, B. Watson, 2005 @@ -13,7 +13,7 @@ die() { exit 1 } -VERSION=2.4.1 +VERSION=2.5 ARCH=${ARCH-i486} BUILD=1 diff --git a/stella/src/unix/stella.spec b/stella/src/unix/stella.spec index 1fe5cf099..628486387 100644 --- a/stella/src/unix/stella.spec +++ b/stella/src/unix/stella.spec @@ -1,5 +1,5 @@ %define name stella -%define version 2.4.1 +%define version 2.5 %define rel 1 %define enable_gl 1 @@ -107,5 +107,8 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} %_datadir/icons/large/%{name}.png %changelog +* Fri Mar 28 2008 Stephen Anthony 2.5-1 +- Version 2.5 release + * Mon Aug 27 2007 Stephen Anthony 2.4.1-1 - Version 2.4.1 release diff --git a/stella/src/win32/stella.iss b/stella/src/win32/stella.iss index 9398d9b64..dd1de62b2 100755 --- a/stella/src/win32/stella.iss +++ b/stella/src/win32/stella.iss @@ -3,14 +3,14 @@ [Setup] AppName=Stella -AppVerName=Stella 2.4.1 +AppVerName=Stella 2.5 AppPublisher=Bradford W. Mott and the Stella team AppPublisherURL=http://stella.sourceforge.net AppSupportURL=http://stella.sourceforge.net AppUpdatesURL=http://stella.sourceforge.net DefaultDirName={pf}\Stella DefaultGroupName=Stella -OutputBaseFilename=stella-2.4.1-win32 +OutputBaseFilename=stella-2.5-win32 Compression=lzma SolidCompression=yes @@ -21,10 +21,10 @@ Name: "eng"; MessagesFile: "compiler:Default.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: "H:\windows\src\stella\stella-2.4.1\stella.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "H:\windows\src\stella\stella-2.4.1\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "H:\windows\src\stella\stella-2.4.1\SDL.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "H:\windows\src\stella\stella-2.4.1\docs\*"; DestDir: "{app}\docs"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "H:\windows\src\stella\stella-2.5\stella.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "H:\windows\src\stella\stella-2.5\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "H:\windows\src\stella\stella-2.5\SDL.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "H:\windows\src\stella\stella-2.5\docs\*"; DestDir: "{app}\docs"; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] diff --git a/stella/src/win32/stella.rc b/stella/src/win32/stella.rc index 20773b249..d365a9679 100755 --- a/stella/src/win32/stella.rc +++ b/stella/src/win32/stella.rc @@ -36,8 +36,8 @@ IDI_ICON ICON "stella.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,4,1,0 - PRODUCTVERSION 2,4,1,0 + FILEVERSION 2,5,0,0 + PRODUCTVERSION 2,5,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 GPL." VALUE "CompanyName", "Bradford W. Mott and the Stella team (http://stella.sourceforge.net)" VALUE "FileDescription", "Stella" - VALUE "FileVersion", "2.4.1" + VALUE "FileVersion", "2.5" VALUE "InternalName", "Stella" - VALUE "LegalCopyright", "Copyright (C) 1995-2007 B. Mott & the Stella team" + VALUE "LegalCopyright", "Copyright (C) 1995-2008 B. Mott & the Stella team" VALUE "OriginalFilename", "Stella.exe" VALUE "ProductName", "Stella" - VALUE "ProductVersion", "2.4.1" + VALUE "ProductVersion", "2.5" END END BLOCK "VarFileInfo"