ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a few bugs from last commit. That's what I get for commiting 

before testing the changes.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@746 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2005-08-25 16:29:52 +00:00
parent fb749d3325
commit b9c20f3287
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stella/src/common/SoundSDL.cxx
View File

@ -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: SoundSDL.cxx,v 1.20 2005-08-25 15:19:17 stephena Exp $
// $Id: SoundSDL.cxx,v 1.21 2005-08-25 16:29:52 stephena Exp $
//============================================================================
#ifdef SOUND_SUPPORT
@ -101,7 +101,7 @@ void SoundSDL::initialize(bool forcerestart)
#ifndef PSP
desired.freq = 31400;
desired.format = AUDIO_U8;
else
#else
desired.freq = 44100;
desired.format = AUDIO_U16;
#endif

12
stella/src/emucore/EventHandler.cxx
View File

@ -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.87 2005-08-25 15:19:17 stephena Exp $
// $Id: EventHandler.cxx,v 1.88 2005-08-25 16:29:52 stephena Exp $
//============================================================================
#include <algorithm>
@ -1434,13 +1434,13 @@ void EventHandler::takeSnapshot()
string sspath = myOSystem->settings().getString("ssdir");
string ssname = myOSystem->settings().getString("ssname");
char separator = ssname[ssname.length()-1] != '/' ? BSPF_PATH_SEPARATOR : '';
if(sspath.substr(sspath.length()-1) != BSPF_PATH_SEPARATOR)
sspath += BSPF_PATH_SEPARATOR;
if(ssname == "romname")
sspath = sspath + separator +
myOSystem->console().properties().get("Cartridge.Name");
sspath += myOSystem->console().properties().get("Cartridge.Name");
else if(ssname == "md5sum")
sspath = sspath + separator +
myOSystem->console().properties().get("Cartridge.MD5");
sspath += myOSystem->console().properties().get("Cartridge.MD5");
// Check whether we want multiple snapshots created
if(!myOSystem->settings().getBool("sssingle"))

6
stella/src/emucore/m6502/src/bspf/src/bspf.hxx
View File

@ -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: bspf.hxx,v 1.9 2005-08-25 15:19:17 stephena Exp $
// $Id: bspf.hxx,v 1.10 2005-08-25 16:29:52 stephena Exp $
//============================================================================
#ifndef BSPF_HXX
@ -24,7 +24,7 @@
that need to be defined for different operating systems.
@author Bradford W. Mott
@version $Id: bspf.hxx,v 1.9 2005-08-25 15:19:17 stephena Exp $
@version $Id: bspf.hxx,v 1.10 2005-08-25 16:29:52 stephena Exp $
*/
// Types for 8-bit signed and unsigned integers
@ -53,7 +53,7 @@ typedef unsigned int uInt32;
#endif
#ifdef PSP
#include "pspstdint.h"
#include "pspstdint.h"
#endif
#ifdef HAVE_INTTYPES