mirror of https://github.com/stella-emu/stella.git
Removed SNAPSHOT_SUPPORT define and all functionality from the codebase.
Snapshot support is now always included, since it doesn't require libpng and is only about 100 lines of code. If your particular port doesn't want it, then don't bind an event to it :) Removed changeWidth() and changeHeight() TIA functionality, in preparation for the release after this one when it will disappear completely from the core. Current ROM's which have these properties set will still function, as long as 'tiadefaults' isn't turned on. Of course, one can still edit the properties manually, but I'd like to discourage it. Updated event strings in EventHandler. We now consistently refer to the first joystick/paddle/driving controller/etc as zero. Some more updates to the manual. I think it's pretty much complete at this point. Bumped version number to '2.3_rc1'. I'm basically finished at this point. All that's left to do is make sure the weird OSX crashes some people are having are fixed, and I'm awaiting feedback on that one. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1223 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena
parent
f53d93446b
commit
025d8b9cdd
|
|
@ -259,8 +259,6 @@ Optional Features:
|
|||
--disable-sound
|
||||
--enable-debugger enable/disable all debugger options [enabled]
|
||||
--disable-debugger
|
||||
--enable-snapshot enable/disable snapshot support [enabled]
|
||||
--disable-snapshot
|
||||
--enable-joystick enable/disable joystick support [enabled]
|
||||
--disable-joystick
|
||||
--enable-cheats enable/disable cheatcode support [enabled]
|
||||
|
|
@ -302,10 +300,8 @@ for ac_option in $@; do
|
|||
--disable-gl) _build_gl=no ;;
|
||||
--enable-sound) _build_sound=yes ;;
|
||||
--disable-sound) _build_sound=no ;;
|
||||
--enable-debugger) _build_debugger=yes ;;
|
||||
--disable-debugger) _build_debugger=no ;;
|
||||
--enable-snapshot) _build_snapshot=yes ;;
|
||||
--disable-snapshot) _build_snapshot=no ;;
|
||||
--enable-debugger) _build_debugger=yes ;;
|
||||
--disable-debugger) _build_debugger=no ;;
|
||||
--enable-joystick) _build_joystick=yes ;;
|
||||
--disable-joystick) _build_joystick=no ;;
|
||||
--enable-cheats) _build_cheats=yes ;;
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 5.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 6.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 6.3 KiB |
|
|
@ -219,6 +219,11 @@
|
|||
<h2><b>New in Release 2.3</b></h2>
|
||||
|
||||
<ul>
|
||||
<li><b>Note: Because of the many changes in this release, all settings
|
||||
will be reset to defaults. If this doesn't happen for you, it will be necessary
|
||||
to manually delete your previous settings (see 'Settings' section for more
|
||||
information).</b></li>
|
||||
|
||||
<li>Potentially huge speedups in software rendering mode, both in emulation
|
||||
and UI modes. Deactivating 'dirty rects' uses these new modes, which
|
||||
can be 2-3 times faster for many configurations.</li>
|
||||
|
|
@ -246,8 +251,7 @@ fixes will come with the TIA rewrite, due in the next release.</li>
|
|||
|
||||
<li>Added new scaler infrastructure, replacing the '-zoom' commandline argument
|
||||
with '-scale_ui' and '-scale_tia'. This means the UI and emulation can now
|
||||
be scaled independently. In the future, support will be added for advanced
|
||||
scalers in TIA mode, such as Scale2x, Scale3x, HQ2x, HQ3x, etc.</li>
|
||||
be scaled independently.</li>
|
||||
|
||||
<li>Added '-gl_vsync' commandline argument and associated UI elements, which
|
||||
uses synchronization to vertical blank interrupt in OpenGL on supported
|
||||
|
|
@ -301,8 +305,12 @@ packages.</li>
|
|||
<li>Removed dependency on PNG library (PNG snapshots are still present, but the
|
||||
actual library is no longer required).</li>
|
||||
|
||||
<li>For the OSX port, improved OpenGL performance on Mac Mini using Intel GMA950
|
||||
video hardware.</li>
|
||||
|
||||
<li>For the GP2X port, added support for PAL ROMs, and updated SDL to use hardware
|
||||
scaling.</li>
|
||||
|
||||
</ul>
|
||||
|
||||
<p>
|
||||
|
|
@ -378,8 +386,9 @@ scaling.</li>
|
|||
<li>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</li>
|
||||
<li>Pentium class machine required (Stella <b>may</b> compile on other
|
||||
architectures, but it hasn't been extensively tested)</li>
|
||||
<li>Pentium class machine required (in general, Stella will compile on other
|
||||
architectures, both 32 and 64-bit, but it hasn't been extensively
|
||||
tested)</li>
|
||||
</ul>
|
||||
|
||||
<p>
|
||||
|
|
@ -895,6 +904,11 @@ scaling.</li>
|
|||
<td>Set "Console.TelevisionType" property.</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td><pre>-sp <Yes|No></pre></td>
|
||||
<td>Set "Console.SwapPorts" property.</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td><pre>-lc <type></pre></td>
|
||||
<td>Set "Controller.Left" property, where type is one of Booster-Grip,
|
||||
|
|
@ -1579,30 +1593,6 @@ scaling.</li>
|
|||
<th>Key (OSX)</th>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>Set "Display.YStart" to next <i>larger</i> value</td>
|
||||
<td>Alt + PageUp</td>
|
||||
<td>Shift-Cmd + PageUp</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>Set "Display.YStart" to next <i>smaller</i> value</td>
|
||||
<td>Alt + PageDown</td>
|
||||
<td>Shift-Cmd + PageDown</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>Set "Display.Height" to next <i>larger</i> value</td>
|
||||
<td>Control + PageUp</td>
|
||||
<td>Cmd + PageUp</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>Set "Display.Height" to next <i>smaller</i> value</td>
|
||||
<td>Control + PageDown</td>
|
||||
<td>Cmd + PageDown</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>Set "Display.XStart" to next <i>larger</i> value</td>
|
||||
<td>Alt + End</td>
|
||||
|
|
@ -1616,15 +1606,15 @@ scaling.</li>
|
|||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>Set "Display.Width" to next <i>larger</i> value</td>
|
||||
<td>Control + End</td>
|
||||
<td>Cmd + End</td>
|
||||
<td>Set "Display.YStart" to next <i>larger</i> value</td>
|
||||
<td>Alt + PageUp</td>
|
||||
<td>Shift-Cmd + PageUp</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>Set "Display.Width" to next <i>smaller</i> value</td>
|
||||
<td>Control + Home</td>
|
||||
<td>Cmd + Home</td>
|
||||
<td>Set "Display.YStart" to next <i>smaller</i> value</td>
|
||||
<td>Alt + PageDown</td>
|
||||
<td>Shift-Cmd + PageDown</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
|
|
@ -1747,16 +1737,25 @@ scaling.</li>
|
|||
<hr>
|
||||
|
||||
<p>This version of Stella has event remapping. Almost every event in the emulator
|
||||
can be remapped to another key on the keyboard or to buttons on up to four
|
||||
can be remapped to another key on the keyboard or to buttons on up to eight
|
||||
joysticks/gamepads (see <b>Section 8 - <a href="#Keyboard">Keyboard Layout</a></b>
|
||||
for those event which can/cannot be remapped).</p>
|
||||
|
||||
<p>Note that there are currently two separate event modes in Stella; emulation
|
||||
mode and user-interface (UI) mode. Each mode has separate mappings, so (for example)
|
||||
while in emulation mode, the left arrow could mean 'joystick 0 left', while in UI
|
||||
mode it could mean 'move cursor to left'. Emulation mode occurs whenever you're
|
||||
actually playing a game. UI mode occurs whenever a user interface is present
|
||||
(ROM launcher, debugger, settings menu, etc). Because of these different modes,
|
||||
there are two separate mapping areas.
|
||||
|
||||
<p>To remap an event:
|
||||
<ol>
|
||||
<li>Start playing a game (ie, start the emulation).</li>
|
||||
<li>Enter options mode be pressing <b>Tab</b>.</li>
|
||||
<li>Enter options mode by pressing <b>Tab</b>.</li>
|
||||
<li>Click the 'Input Settings' button.</li>
|
||||
<li>Click the 'Event Mapping' tab.</li>
|
||||
<li>If you wish to remap emulation events, click the 'Emul. Events' tab.
|
||||
Otherwise, click the 'UI Events' tab for user interface events.</li>
|
||||
<li>Select event you want to remap and click the 'Map' button.</li>
|
||||
<li>Press a key or a joystick button, and that key/button will be bound
|
||||
to the selected event. If nothing seems to happen, either Stella
|
||||
|
|
@ -1765,7 +1764,6 @@ scaling.</li>
|
|||
<li>Erase a mapping by clicking 'Erase', or cancel a remap in progress
|
||||
by clicking 'Cancel'.</li>
|
||||
<li>Reset default mappings by clicking 'Defaults'.</li>
|
||||
<li>Change mouse/paddle emulation in the 'Mouse is paddle' dropdown box.</li>
|
||||
</ol>
|
||||
|
||||
<p>The following screenshots illustrate the event remapping process:<br><br>
|
||||
|
|
@ -1773,6 +1771,32 @@ scaling.</li>
|
|||
<p>
|
||||
<img src="graphics/eventmapping_remap.png">
|
||||
|
||||
<p>Virtual devices can be configured under the 'Virtual Devs' tab, shown below:<br><br>
|
||||
<img src="graphics/eventmapping_virtualdevs.png"></p>
|
||||
|
||||
<p>Stelladaptor devices can be configured to either the left or right virtual
|
||||
ports. See the section 'Stelladaptor Support' for more information.</p>
|
||||
|
||||
<p>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.</p>
|
||||
|
||||
<p>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).</p>
|
||||
|
||||
<p>Paddle x 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.</p>
|
||||
|
||||
|
||||
|
||||
<br><br><br>
|
||||
<p><h1>
|
||||
<a name="Cheats">10. Cheatcode Manager</a></h1>
|
||||
|
|
@ -2045,7 +2069,7 @@ Ms Pac-Man (Stella extended codes):
|
|||
</tr>
|
||||
|
||||
<tr>
|
||||
<td VALIGN="TOP"><i>Display.Width:</i></td>
|
||||
<td VALIGN="TOP"><i>Display.Width: (*)</i></td>
|
||||
<td>This property indicates the number of pixels to display per
|
||||
scan-line. The value of this property must be <i>n</i> such that
|
||||
80 <= <i>n</i> <= 160 and <i>n</i> is divisible by 4.</td>
|
||||
|
|
@ -2059,7 +2083,7 @@ Ms Pac-Man (Stella extended codes):
|
|||
</tr>
|
||||
|
||||
<tr>
|
||||
<td VALIGN="TOP"><i>Display.Height:</i></td>
|
||||
<td VALIGN="TOP"><i>Display.Height: (*)</i></td>
|
||||
<td>This property indicates the number of scan-lines to display.
|
||||
The value of this property must be <i>n</i> such that
|
||||
100 <= <i>n</i> <= 256.</td>
|
||||
|
|
@ -2086,6 +2110,9 @@ Ms Pac-Man (Stella extended codes):
|
|||
</tr>
|
||||
</table>
|
||||
|
||||
<p><b>Note:</b> Items marked as '*' are deprecated, and will probably be
|
||||
removed in the next release.</p>
|
||||
|
||||
<br><br>
|
||||
<p><h1>
|
||||
<a name="Adaptor">13. Stelladaptor Support</a></h1>
|
||||
|
|
@ -2104,11 +2131,11 @@ Ms Pac-Man (Stella extended codes):
|
|||
<ul>
|
||||
<li>The first Stelladaptor found will act as the <b>left game port</b>
|
||||
on a real Atari. Depending on the device, Stella will detect it as
|
||||
either the left joystick, paddles 1 & 2, or the left driving controller.</li>
|
||||
either the left joystick, paddles 0 & 1, or the left driving controller.</li>
|
||||
|
||||
<li>The second Stelladaptor found will act as the <b>right game port</b>
|
||||
on a real Atari. Depending on the device, Stella will detect it as
|
||||
either the right joystick, paddles 3 & 4, or the right driving controller.</li>
|
||||
either the right joystick, paddles 2 & 3, or the right driving controller.</li>
|
||||
|
||||
<li>Any other Stelladaptors will be ignored.</li>
|
||||
|
||||
|
|
@ -2132,7 +2159,7 @@ Ms Pac-Man (Stella extended codes):
|
|||
</tr>
|
||||
<tr>
|
||||
<td><b>original</b></td>
|
||||
<td>The palette used in the original StellaX.</td>
|
||||
<td>The palette used in the original StellaX emulator.</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b>z26</b></td>
|
||||
|
|
|
|||
|
|
@ -13,11 +13,9 @@
|
|||
// See the file "license" for information on usage and redistribution of
|
||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//
|
||||
// $Id: Snapshot.cxx,v 1.14 2006-12-08 16:48:56 stephena Exp $
|
||||
// $Id: Snapshot.cxx,v 1.15 2006-12-18 16:44:39 stephena Exp $
|
||||
//============================================================================
|
||||
|
||||
#ifdef SNAPSHOT_SUPPORT
|
||||
|
||||
#include <zlib.h>
|
||||
#include <fstream>
|
||||
#include <cstring>
|
||||
|
|
@ -164,5 +162,3 @@ void Snapshot::writePNGText(ofstream& out, const string& key, const string& text
|
|||
|
||||
delete[] data;
|
||||
}
|
||||
|
||||
#endif // SNAPSHOT_SUPPORT
|
||||
|
|
|
|||
|
|
@ -13,14 +13,12 @@
|
|||
// See the file "license" for information on usage and redistribution of
|
||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//
|
||||
// $Id: Snapshot.hxx,v 1.9 2006-12-08 16:48:56 stephena Exp $
|
||||
// $Id: Snapshot.hxx,v 1.10 2006-12-18 16:44:39 stephena Exp $
|
||||
//============================================================================
|
||||
|
||||
#ifndef SNAPSHOT_HXX
|
||||
#define SNAPSHOT_HXX
|
||||
|
||||
#ifdef SNAPSHOT_SUPPORT
|
||||
|
||||
class Properties;
|
||||
class FrameBuffer;
|
||||
|
||||
|
|
@ -45,6 +43,4 @@ class Snapshot
|
|||
static void writePNGText(ofstream& out, const string& key, const string& text);
|
||||
};
|
||||
|
||||
#endif // SNAPSHOT_SUPPORT
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
// See the file "license" for information on usage and redistribution of
|
||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//
|
||||
// $Id: Version.hxx,v 1.18 2006-12-15 20:22:29 stephena Exp $
|
||||
// $Id: Version.hxx,v 1.19 2006-12-18 16:44:39 stephena Exp $
|
||||
//============================================================================
|
||||
|
||||
#ifndef VERSION_HXX
|
||||
#define VERSION_HXX
|
||||
|
||||
#define STELLA_BASE_VERSION "2.3_alpha"
|
||||
#define STELLA_BASE_VERSION "2.3_rc1"
|
||||
|
||||
#ifdef NIGHTLY_BUILD
|
||||
#define STELLA_VERSION STELLA_BASE_VERSION "pre-" NIGHTLY_BUILD
|
||||
|
|
@ -33,6 +33,6 @@
|
|||
// For each new release, this should only be bumped if there have been
|
||||
// major changes in some settings; changes which could stop Stella from
|
||||
// actually working.
|
||||
#define STELLA_SETTINGS_VERSION "2.3_alpha"
|
||||
#define STELLA_SETTINGS_VERSION "2.3_rc1"
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -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: Console.cxx,v 1.108 2006-12-15 16:42:55 stephena Exp $
|
||||
// $Id: Console.cxx,v 1.109 2006-12-18 16:44:39 stephena Exp $
|
||||
//============================================================================
|
||||
|
||||
#include <assert.h>
|
||||
|
|
@ -49,10 +49,6 @@
|
|||
#include "CommandMenu.hxx"
|
||||
#include "Version.hxx"
|
||||
|
||||
#ifdef SNAPSHOT_SUPPORT
|
||||
#include "Snapshot.hxx"
|
||||
#endif
|
||||
|
||||
#ifdef DEBUGGER_SUPPORT
|
||||
#include "Debugger.hxx"
|
||||
#endif
|
||||
|
|
@ -566,88 +562,6 @@ void Console::changeYStart(int direction)
|
|||
myOSystem->frameBuffer().showMessage(message);
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void Console::changeWidth(int direction)
|
||||
{
|
||||
uInt32 xstart = atoi(myProperties.get(Display_XStart).c_str());
|
||||
Int32 width = atoi(myProperties.get(Display_Width).c_str());
|
||||
ostringstream strval;
|
||||
string message;
|
||||
|
||||
if(direction == +1) // increase Width
|
||||
{
|
||||
width += 4;
|
||||
if((width > 160) || ((width % 4) != 0))
|
||||
{
|
||||
myOSystem->frameBuffer().showMessage("Width at maximum");
|
||||
return;
|
||||
}
|
||||
else if((width + xstart) > 160)
|
||||
{
|
||||
myOSystem->frameBuffer().showMessage("Width no effect");
|
||||
return;
|
||||
}
|
||||
}
|
||||
else if(direction == -1) // decrease Width
|
||||
{
|
||||
width -= 4;
|
||||
if(width < 80)
|
||||
{
|
||||
myOSystem->frameBuffer().showMessage("Width at minimum");
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
return;
|
||||
|
||||
strval << width;
|
||||
myProperties.set(Display_Width, strval.str());
|
||||
mySystem->reset();
|
||||
initializeVideo();
|
||||
|
||||
message = "Width ";
|
||||
message += strval.str();
|
||||
myOSystem->frameBuffer().showMessage(message);
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void Console::changeHeight(int direction)
|
||||
{
|
||||
Int32 height = atoi(myProperties.get(Display_Height).c_str());
|
||||
ostringstream strval;
|
||||
string message;
|
||||
|
||||
if(direction == +1) // increase Height
|
||||
{
|
||||
height++;
|
||||
if(height > 256)
|
||||
{
|
||||
myOSystem->frameBuffer().showMessage("Height at maximum");
|
||||
return;
|
||||
}
|
||||
}
|
||||
else if(direction == -1) // decrease Height
|
||||
{
|
||||
height--;
|
||||
if(height < 100)
|
||||
{
|
||||
myOSystem->frameBuffer().showMessage("Height at minimum");
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
return;
|
||||
|
||||
strval << height;
|
||||
myProperties.set(Display_Height, strval.str());
|
||||
mySystem->reset();
|
||||
initializeVideo();
|
||||
|
||||
message = "Height ";
|
||||
message += strval.str();
|
||||
myOSystem->frameBuffer().showMessage(message);
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void Console::toggleTIABit(TIA::TIABit bit, const string& bitname, bool show)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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: Console.hxx,v 1.50 2006-12-08 16:49:23 stephena Exp $
|
||||
// $Id: Console.hxx,v 1.51 2006-12-18 16:44:39 stephena Exp $
|
||||
//============================================================================
|
||||
|
||||
#ifndef CONSOLE_HXX
|
||||
|
|
@ -38,7 +38,7 @@ class System;
|
|||
This class represents the entire game console.
|
||||
|
||||
@author Bradford W. Mott
|
||||
@version $Id: Console.hxx,v 1.50 2006-12-08 16:49:23 stephena Exp $
|
||||
@version $Id: Console.hxx,v 1.51 2006-12-18 16:44:39 stephena Exp $
|
||||
*/
|
||||
class Console
|
||||
{
|
||||
|
|
@ -194,7 +194,6 @@ class Console
|
|||
*/
|
||||
void fry();
|
||||
|
||||
public:
|
||||
/**
|
||||
Change the "Display.XStart" variable. Currently, a system reset is issued
|
||||
after the change. GUI's may need to resize their viewports.
|
||||
|
|
@ -211,22 +210,6 @@ class Console
|
|||
*/
|
||||
void changeYStart(int direction);
|
||||
|
||||
/**
|
||||
Change the "Display.XStart" variable. Currently, a system reset is issued
|
||||
after the change. GUI's may need to resize their viewports.
|
||||
|
||||
@param direction +1 indicates increase, -1 indicates decrease.
|
||||
*/
|
||||
void changeWidth(int direction);
|
||||
|
||||
/**
|
||||
Change the "Display.XStart" variable. Currently, a system reset is issued
|
||||
after the change. GUI's may need to resize their viewports.
|
||||
|
||||
@param direction +1 indicates increase, -1 indicates decrease.
|
||||
*/
|
||||
void changeHeight(int direction);
|
||||
|
||||
/**
|
||||
Toggles the TIA bit specified in the method name.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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: EventHandler.cxx,v 1.188 2006-12-18 14:01:58 stephena Exp $
|
||||
// $Id: EventHandler.cxx,v 1.189 2006-12-18 16:44:39 stephena Exp $
|
||||
//============================================================================
|
||||
|
||||
#include <sstream>
|
||||
|
|
@ -36,19 +36,15 @@
|
|||
#include "Deserializer.hxx"
|
||||
#include "Serializer.hxx"
|
||||
#include "PropsSet.hxx"
|
||||
#include "Snapshot.hxx"
|
||||
#include "bspf.hxx"
|
||||
|
||||
#ifdef DEBUGGER_SUPPORT
|
||||
#include "Debugger.hxx"
|
||||
#endif
|
||||
|
||||
#ifdef SNAPSHOT_SUPPORT
|
||||
#include "Snapshot.hxx"
|
||||
#endif
|
||||
|
||||
#ifdef CHEATCODE_SUPPORT
|
||||
#include "CheatManager.hxx"
|
||||
#endif
|
||||
#ifdef DEBUGGER_SUPPORT
|
||||
#include "Debugger.hxx"
|
||||
#endif
|
||||
|
||||
#ifdef MAC_OSX
|
||||
extern "C" {
|
||||
|
|
@ -586,22 +582,6 @@ void EventHandler::poll(uInt32 time)
|
|||
myOSystem->createConsole();
|
||||
break;
|
||||
|
||||
case SDLK_END: // Ctrl-End increases Width
|
||||
myOSystem->console().changeWidth(+1);
|
||||
break;
|
||||
|
||||
case SDLK_HOME: // Ctrl-Home decreases Width
|
||||
myOSystem->console().changeWidth(-1);
|
||||
break;
|
||||
|
||||
case SDLK_PAGEUP: // Ctrl-PageUp increases Height
|
||||
myOSystem->console().changeHeight(+1);
|
||||
break;
|
||||
|
||||
case SDLK_PAGEDOWN: // Ctrl-PageDown decreases Height
|
||||
myOSystem->console().changeHeight(-1);
|
||||
break;
|
||||
|
||||
case SDLK_s: // Ctrl-s saves properties to a file
|
||||
{
|
||||
string filename = myOSystem->baseDir() + BSPF_PATH_SEPARATOR +
|
||||
|
|
@ -2140,7 +2120,6 @@ void EventHandler::loadState(int state)
|
|||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void EventHandler::takeSnapshot()
|
||||
{
|
||||
#ifdef SNAPSHOT_SUPPORT
|
||||
// Figure out the correct snapshot name
|
||||
string filename;
|
||||
string sspath = myOSystem->settings().getString("ssdir");
|
||||
|
|
@ -2175,9 +2154,6 @@ void EventHandler::takeSnapshot()
|
|||
// Now create a PNG snapshot
|
||||
Snapshot::savePNG(myOSystem->frameBuffer(),
|
||||
myOSystem->console().properties(), filename);
|
||||
#else
|
||||
myOSystem->frameBuffer().showMessage("Snapshots unsupported");
|
||||
#endif
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
|
@ -2579,10 +2555,10 @@ EventHandler::ActionList EventHandler::ourEmulActionList[kEmulActionListSize] =
|
|||
{ Event::ConsoleReset, "Reset", 0 },
|
||||
{ Event::ConsoleColor, "Color TV", 0 },
|
||||
{ Event::ConsoleBlackWhite, "Black & White TV", 0 },
|
||||
{ Event::ConsoleLeftDifficultyA, "P1 Difficulty A", 0 },
|
||||
{ Event::ConsoleLeftDifficultyB, "P1 Difficulty B", 0 },
|
||||
{ Event::ConsoleRightDifficultyA, "P2 Difficulty A", 0 },
|
||||
{ Event::ConsoleRightDifficultyB, "P2 Difficulty B", 0 },
|
||||
{ Event::ConsoleLeftDifficultyA, "P0 Difficulty A", 0 },
|
||||
{ Event::ConsoleLeftDifficultyB, "P0 Difficulty B", 0 },
|
||||
{ Event::ConsoleRightDifficultyA, "P1 Difficulty A", 0 },
|
||||
{ Event::ConsoleRightDifficultyB, "P1 Difficulty B", 0 },
|
||||
{ Event::SaveState, "Save State", 0 },
|
||||
{ Event::ChangeState, "Change State", 0 },
|
||||
{ Event::LoadState, "Load State", 0 },
|
||||
|
|
@ -2597,77 +2573,77 @@ EventHandler::ActionList EventHandler::ourEmulActionList[kEmulActionListSize] =
|
|||
{ Event::LauncherMode, "Enter ROM launcher", 0 },
|
||||
{ Event::Quit, "Quit", 0 },
|
||||
|
||||
{ Event::JoystickZeroUp, "P1 Joystick Up", 0 },
|
||||
{ Event::JoystickZeroDown, "P1 Joystick Down", 0 },
|
||||
{ Event::JoystickZeroLeft, "P1 Joystick Left", 0 },
|
||||
{ Event::JoystickZeroRight, "P1 Joystick Right", 0 },
|
||||
{ Event::JoystickZeroFire, "P1 Joystick Fire", 0 },
|
||||
{ Event::JoystickZeroUp, "P0 Joystick Up", 0 },
|
||||
{ Event::JoystickZeroDown, "P0 Joystick Down", 0 },
|
||||
{ Event::JoystickZeroLeft, "P0 Joystick Left", 0 },
|
||||
{ Event::JoystickZeroRight, "P0 Joystick Right", 0 },
|
||||
{ Event::JoystickZeroFire, "P0 Joystick Fire", 0 },
|
||||
|
||||
{ Event::JoystickOneUp, "P2 Joystick Up", 0 },
|
||||
{ Event::JoystickOneDown, "P2 Joystick Down", 0 },
|
||||
{ Event::JoystickOneLeft, "P2 Joystick Left", 0 },
|
||||
{ Event::JoystickOneRight, "P2 Joystick Right", 0 },
|
||||
{ Event::JoystickOneFire, "P2 Joystick Fire", 0 },
|
||||
{ Event::JoystickOneUp, "P1 Joystick Up", 0 },
|
||||
{ Event::JoystickOneDown, "P1 Joystick Down", 0 },
|
||||
{ Event::JoystickOneLeft, "P1 Joystick Left", 0 },
|
||||
{ Event::JoystickOneRight, "P1 Joystick Right", 0 },
|
||||
{ Event::JoystickOneFire, "P1 Joystick Fire", 0 },
|
||||
|
||||
{ Event::PaddleZeroAnalog, "Paddle 1 Analog", 0 },
|
||||
{ Event::PaddleZeroDecrease, "Paddle 1 Decrease", 0 },
|
||||
{ Event::PaddleZeroIncrease, "Paddle 1 Increase", 0 },
|
||||
{ Event::PaddleZeroFire, "Paddle 1 Fire", 0 },
|
||||
{ Event::PaddleZeroAnalog, "Paddle 0 Analog", 0 },
|
||||
{ Event::PaddleZeroDecrease, "Paddle 0 Decrease", 0 },
|
||||
{ Event::PaddleZeroIncrease, "Paddle 0 Increase", 0 },
|
||||
{ Event::PaddleZeroFire, "Paddle 0 Fire", 0 },
|
||||
|
||||
{ Event::PaddleOneAnalog, "Paddle 2 Analog", 0 },
|
||||
{ Event::PaddleOneDecrease, "Paddle 2 Decrease", 0 },
|
||||
{ Event::PaddleOneIncrease, "Paddle 2 Increase", 0 },
|
||||
{ Event::PaddleOneFire, "Paddle 2 Fire", 0 },
|
||||
{ Event::PaddleOneAnalog, "Paddle 1 Analog", 0 },
|
||||
{ Event::PaddleOneDecrease, "Paddle 1 Decrease", 0 },
|
||||
{ Event::PaddleOneIncrease, "Paddle 1 Increase", 0 },
|
||||
{ Event::PaddleOneFire, "Paddle 1 Fire", 0 },
|
||||
|
||||
{ Event::PaddleTwoAnalog, "Paddle 3 Analog", 0 },
|
||||
{ Event::PaddleTwoDecrease, "Paddle 3 Decrease", 0 },
|
||||
{ Event::PaddleTwoIncrease, "Paddle 3 Increase", 0 },
|
||||
{ Event::PaddleTwoFire, "Paddle 3 Fire", 0 },
|
||||
{ Event::PaddleTwoAnalog, "Paddle 2 Analog", 0 },
|
||||
{ Event::PaddleTwoDecrease, "Paddle 2 Decrease", 0 },
|
||||
{ Event::PaddleTwoIncrease, "Paddle 2 Increase", 0 },
|
||||
{ Event::PaddleTwoFire, "Paddle 2 Fire", 0 },
|
||||
|
||||
{ Event::PaddleThreeAnalog, "Paddle 4 Analog", 0 },
|
||||
{ Event::PaddleThreeDecrease, "Paddle 4 Decrease", 0 },
|
||||
{ Event::PaddleThreeIncrease, "Paddle 4 Increase", 0 },
|
||||
{ Event::PaddleThreeFire, "Paddle 4 Fire", 0 },
|
||||
{ Event::PaddleThreeAnalog, "Paddle 3 Analog", 0 },
|
||||
{ Event::PaddleThreeDecrease, "Paddle 3 Decrease", 0 },
|
||||
{ Event::PaddleThreeIncrease, "Paddle 3 Increase", 0 },
|
||||
{ Event::PaddleThreeFire, "Paddle 3 Fire", 0 },
|
||||
|
||||
{ Event::BoosterGripZeroTrigger, "P1 Booster-Grip Trigger", 0 },
|
||||
{ Event::BoosterGripZeroBooster, "P1 Booster-Grip Booster", 0 },
|
||||
{ Event::BoosterGripZeroTrigger, "P0 Booster-Grip Trigger", 0 },
|
||||
{ Event::BoosterGripZeroBooster, "P0 Booster-Grip Booster", 0 },
|
||||
|
||||
{ Event::BoosterGripOneTrigger, "P2 Booster-Grip Trigger", 0 },
|
||||
{ Event::BoosterGripOneBooster, "P2 Booster-Grip Booster", 0 },
|
||||
{ Event::BoosterGripOneTrigger, "P1 Booster-Grip Trigger", 0 },
|
||||
{ Event::BoosterGripOneBooster, "P1 Booster-Grip Booster", 0 },
|
||||
|
||||
{ Event::DrivingZeroCounterClockwise, "P1 Driving Controller Left", 0 },
|
||||
{ Event::DrivingZeroClockwise, "P1 Driving Controller Right", 0 },
|
||||
{ Event::DrivingZeroFire, "P1 Driving Controller Fire", 0 },
|
||||
{ Event::DrivingZeroCounterClockwise, "P0 Driving Controller Left", 0 },
|
||||
{ Event::DrivingZeroClockwise, "P0 Driving Controller Right", 0 },
|
||||
{ Event::DrivingZeroFire, "P0 Driving Controller Fire", 0 },
|
||||
|
||||
{ Event::DrivingOneCounterClockwise, "P2 Driving Controller Left", 0 },
|
||||
{ Event::DrivingOneClockwise, "P2 Driving Controller Right", 0 },
|
||||
{ Event::DrivingOneFire, "P2 Driving Controller Fire", 0 },
|
||||
{ Event::DrivingOneCounterClockwise, "P1 Driving Controller Left", 0 },
|
||||
{ Event::DrivingOneClockwise, "P1 Driving Controller Right", 0 },
|
||||
{ Event::DrivingOneFire, "P1 Driving Controller Fire", 0 },
|
||||
|
||||
{ Event::KeyboardZero1, "P1 Keyboard 1", 0 },
|
||||
{ Event::KeyboardZero2, "P1 Keyboard 2", 0 },
|
||||
{ Event::KeyboardZero3, "P1 Keyboard 3", 0 },
|
||||
{ Event::KeyboardZero4, "P1 Keyboard 4", 0 },
|
||||
{ Event::KeyboardZero5, "P1 Keyboard 5", 0 },
|
||||
{ Event::KeyboardZero6, "P1 Keyboard 6", 0 },
|
||||
{ Event::KeyboardZero7, "P1 Keyboard 7", 0 },
|
||||
{ Event::KeyboardZero8, "P1 Keyboard 8", 0 },
|
||||
{ Event::KeyboardZero9, "P1 Keyboard 9", 0 },
|
||||
{ Event::KeyboardZeroStar, "P1 Keyboard *", 0 },
|
||||
{ Event::KeyboardZero0, "P1 Keyboard 0", 0 },
|
||||
{ Event::KeyboardZeroPound, "P1 Keyboard #", 0 },
|
||||
{ Event::KeyboardZero1, "P0 Keyboard 1", 0 },
|
||||
{ Event::KeyboardZero2, "P0 Keyboard 2", 0 },
|
||||
{ Event::KeyboardZero3, "P0 Keyboard 3", 0 },
|
||||
{ Event::KeyboardZero4, "P0 Keyboard 4", 0 },
|
||||
{ Event::KeyboardZero5, "P0 Keyboard 5", 0 },
|
||||
{ Event::KeyboardZero6, "P0 Keyboard 6", 0 },
|
||||
{ Event::KeyboardZero7, "P0 Keyboard 7", 0 },
|
||||
{ Event::KeyboardZero8, "P0 Keyboard 8", 0 },
|
||||
{ Event::KeyboardZero9, "P0 Keyboard 9", 0 },
|
||||
{ Event::KeyboardZeroStar, "P0 Keyboard *", 0 },
|
||||
{ Event::KeyboardZero0, "P0 Keyboard 0", 0 },
|
||||
{ Event::KeyboardZeroPound, "P0 Keyboard #", 0 },
|
||||
|
||||
{ Event::KeyboardOne1, "P2 Keyboard 1", 0 },
|
||||
{ Event::KeyboardOne2, "P2 Keyboard 2", 0 },
|
||||
{ Event::KeyboardOne3, "P2 Keyboard 3", 0 },
|
||||
{ Event::KeyboardOne4, "P2 Keyboard 4", 0 },
|
||||
{ Event::KeyboardOne5, "P2 Keyboard 5", 0 },
|
||||
{ Event::KeyboardOne6, "P2 Keyboard 6", 0 },
|
||||
{ Event::KeyboardOne7, "P2 Keyboard 7", 0 },
|
||||
{ Event::KeyboardOne8, "P2 Keyboard 8", 0 },
|
||||
{ Event::KeyboardOne9, "P2 Keyboard 9", 0 },
|
||||
{ Event::KeyboardOneStar, "P2 Keyboard *", 0 },
|
||||
{ Event::KeyboardOne0, "P2 Keyboard 0", 0 },
|
||||
{ Event::KeyboardOnePound, "P2 Keyboard #", 0 }
|
||||
{ Event::KeyboardOne1, "P1 Keyboard 1", 0 },
|
||||
{ Event::KeyboardOne2, "P1 Keyboard 2", 0 },
|
||||
{ Event::KeyboardOne3, "P1 Keyboard 3", 0 },
|
||||
{ Event::KeyboardOne4, "P1 Keyboard 4", 0 },
|
||||
{ Event::KeyboardOne5, "P1 Keyboard 5", 0 },
|
||||
{ Event::KeyboardOne6, "P1 Keyboard 6", 0 },
|
||||
{ Event::KeyboardOne7, "P1 Keyboard 7", 0 },
|
||||
{ Event::KeyboardOne8, "P1 Keyboard 8", 0 },
|
||||
{ Event::KeyboardOne9, "P1 Keyboard 9", 0 },
|
||||
{ Event::KeyboardOneStar, "P1 Keyboard *", 0 },
|
||||
{ Event::KeyboardOne0, "P1 Keyboard 0", 0 },
|
||||
{ Event::KeyboardOnePound, "P1 Keyboard #", 0 }
|
||||
};
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
|
|
|||
|
|
@ -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: OSystem.cxx,v 1.81 2006-12-18 14:01:58 stephena Exp $
|
||||
// $Id: OSystem.cxx,v 1.82 2006-12-18 16:44:39 stephena Exp $
|
||||
//============================================================================
|
||||
|
||||
#include <cassert>
|
||||
|
|
@ -169,9 +169,7 @@ bool OSystem::create()
|
|||
#ifdef JOYSTICK_SUPPORT
|
||||
myFeatures += "Joystick ";
|
||||
#endif
|
||||
#ifdef SNAPSHOT_SUPPORT
|
||||
myFeatures += "Snapshot ";
|
||||
#endif
|
||||
#ifdef DEBUGGER_SUPPORT
|
||||
myFeatures += "Debugger ";
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -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.103 2006-12-15 20:22:29 stephena Exp $
|
||||
// $Id: Settings.cxx,v 1.104 2006-12-18 16:44:39 stephena Exp $
|
||||
//============================================================================
|
||||
|
||||
#include <cassert>
|
||||
|
|
@ -344,11 +344,9 @@ void Settings::usage()
|
|||
#ifdef UNIX
|
||||
<< " -accurate <1|0> Accurate game timing (uses more CPU)\n"
|
||||
#endif
|
||||
#ifdef SNAPSHOT_SUPPORT
|
||||
<< " -ssdir <path> The directory to save snapshot files to\n"
|
||||
<< " -sssingle <1|0> Generate single snapshot instead of many\n"
|
||||
<< endl
|
||||
#endif
|
||||
<< " -listrominfo Display contents of stella.pro, one line per ROM entry\n"
|
||||
<< " -help Show the text you're now reading\n"
|
||||
#ifdef DEBUGGER_SUPPORT
|
||||
|
|
|
|||
|
|
@ -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: InputDialog.cxx,v 1.20 2006-12-11 20:43:55 stephena Exp $
|
||||
// $Id: InputDialog.cxx,v 1.21 2006-12-18 16:44:40 stephena Exp $
|
||||
//============================================================================
|
||||
|
||||
// FIXME - this whole dialog should be a dialog of buttons instead of
|
||||
|
|
@ -53,8 +53,8 @@ InputDialog::InputDialog(OSystem* osystem, DialogContainer* parent,
|
|||
myTab->setParentWidget(tabID, myEmulEventMapper);
|
||||
addToFocusList(myEmulEventMapper->getFocusList(), tabID);
|
||||
|
||||
// 2) Event mapper for menu actions
|
||||
tabID = myTab->addTab("Menu Events");
|
||||
// 2) Event mapper for UI actions
|
||||
tabID = myTab->addTab("UI Events");
|
||||
const StringList& mactions = instance()->eventHandler().getActionList(kMenuMode);
|
||||
myMenuEventMapper = new EventMappingWidget(myTab, font, 2, 2,
|
||||
myTab->getWidth(),
|
||||
|
|
|
|||
|
|
@ -242,7 +242,7 @@
|
|||
INSTALL_PATH = "$(HOME)/Applications";
|
||||
LIBRARY_SEARCH_PATHS = .;
|
||||
OPTIMIZATION_CFLAGS = "-O3";
|
||||
OTHER_CFLAGS = "-DMAC_OSX -DJOYSTICK_SUPPORT -DSOUND_SUPPORT -DDISPLAY_OPENGL -DDEBUGGER_SUPPORT -DCHEATCODE_SUPPORT -DHAVE_GETTIMEOFDAY -DSNAPSHOT_SUPPORT -DBSPF_MAC_OSX -DHAVE_INTTYPES ";
|
||||
OTHER_CFLAGS = "-DMAC_OSX -DJOYSTICK_SUPPORT -DSOUND_SUPPORT -DDISPLAY_OPENGL -DDEBUGGER_SUPPORT -DCHEATCODE_SUPPORT -DHAVE_GETTIMEOFDAY -DBSPF_MAC_OSX -DHAVE_INTTYPES ";
|
||||
OTHER_LDFLAGS = "-framework SDL -lz";
|
||||
PRODUCT_NAME = StellaOSX;
|
||||
SECTORDER_FLAGS = "";
|
||||
|
|
|
|||
|
|
@ -1731,7 +1731,6 @@
|
|||
CHEATCODE_SUPPORT,
|
||||
DEBUGGER_SUPPORT,
|
||||
HAVE_GETTIMEOFDAY,
|
||||
SNAPSHOT_SUPPORT,
|
||||
BSPF_MAC_OSX,
|
||||
HAVE_INTTYPES,
|
||||
);
|
||||
|
|
@ -1789,7 +1788,6 @@
|
|||
CHEATCODE_SUPPORT,
|
||||
DEBUGGER_SUPPORT,
|
||||
HAVE_GETTIMEOFDAY,
|
||||
SNAPSHOT_SUPPORT,
|
||||
BSPF_MAC_OSX,
|
||||
HAVE_INTTYPES,
|
||||
);
|
||||
|
|
@ -1845,7 +1843,6 @@
|
|||
CHEATCODE_SUPPORT,
|
||||
DEBUGGER_SUPPORT,
|
||||
HAVE_GETTIMEOFDAY,
|
||||
SNAPSHOT_SUPPORT,
|
||||
BSPF_MAC_OSX,
|
||||
HAVE_INTTYPES,
|
||||
);
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\yacc;..\debugger;..\gui;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\win32;..\debugger\gui;..\cheat"
|
||||
PreprocessorDefinitions="BSPF_WIN32;WIN32;_DEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;SNAPSHOT_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
|
||||
PreprocessorDefinitions="BSPF_WIN32;WIN32;_DEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;SOUND_SUPPORT;CHEATCODE_SUPPORT"
|
||||
MinimalRebuild="TRUE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="2"
|
||||
|
|
@ -73,7 +73,7 @@ SDLmain.lib
|
|||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories="..\yacc;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat"
|
||||
PreprocessorDefinitions="BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;SNAPSHOT_SUPPORT;DISPLAY_OPENGL;SOUND_SUPPORT;CHEATCODE_SUPPORT"
|
||||
PreprocessorDefinitions="BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;SOUND_SUPPORT;CHEATCODE_SUPPORT"
|
||||
RuntimeLibrary="2"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="2"
|
||||
|
|
|
|||
Loading…
Reference in New Issue