diff --git a/stella/src/common/FrameBufferGL.hxx b/stella/src/common/FrameBufferGL.hxx index 2977ffbd1..1b4f01f27 100644 --- a/stella/src/common/FrameBufferGL.hxx +++ b/stella/src/common/FrameBufferGL.hxx @@ -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: FrameBufferGL.hxx,v 1.56 2008-08-05 12:54:47 stephena Exp $ +// $Id: FrameBufferGL.hxx,v 1.57 2008-11-02 16:46:05 stephena Exp $ //============================================================================ #ifndef FRAMEBUFFER_GL_HXX @@ -26,7 +26,6 @@ #include class OSystem; -class GUI::Font; class FBSurfaceGL; #include "bspf.hxx" @@ -36,7 +35,7 @@ class FBSurfaceGL; This class implements an SDL OpenGL framebuffer. @author Stephen Anthony - @version $Id: FrameBufferGL.hxx,v 1.56 2008-08-05 12:54:47 stephena Exp $ + @version $Id: FrameBufferGL.hxx,v 1.57 2008-11-02 16:46:05 stephena Exp $ */ class FrameBufferGL : public FrameBuffer { @@ -202,7 +201,7 @@ class FrameBufferGL : public FrameBuffer A surface suitable for OpenGL rendering mode. @author Stephen Anthony - @version $Id: FrameBufferGL.hxx,v 1.56 2008-08-05 12:54:47 stephena Exp $ + @version $Id: FrameBufferGL.hxx,v 1.57 2008-11-02 16:46:05 stephena Exp $ */ class FBSurfaceGL : public FBSurface { diff --git a/stella/src/common/FrameBufferSoft.hxx b/stella/src/common/FrameBufferSoft.hxx index 87b85a279..9a1f53bda 100644 --- a/stella/src/common/FrameBufferSoft.hxx +++ b/stella/src/common/FrameBufferSoft.hxx @@ -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: FrameBufferSoft.hxx,v 1.54 2008-08-04 11:56:11 stephena Exp $ +// $Id: FrameBufferSoft.hxx,v 1.55 2008-11-02 16:46:05 stephena Exp $ //============================================================================ #ifndef FRAMEBUFFER_SOFT_HXX @@ -22,7 +22,6 @@ #include class OSystem; -class GUI::Font; class RectList; #include "bspf.hxx" @@ -33,7 +32,7 @@ class RectList; This class implements an SDL software framebuffer. @author Stephen Anthony - @version $Id: FrameBufferSoft.hxx,v 1.54 2008-08-04 11:56:11 stephena Exp $ + @version $Id: FrameBufferSoft.hxx,v 1.55 2008-11-02 16:46:05 stephena Exp $ */ class FrameBufferSoft : public FrameBuffer { @@ -173,7 +172,7 @@ class FrameBufferSoft : public FrameBuffer A surface suitable for software rendering mode. @author Stephen Anthony - @version $Id: FrameBufferSoft.hxx,v 1.54 2008-08-04 11:56:11 stephena Exp $ + @version $Id: FrameBufferSoft.hxx,v 1.55 2008-11-02 16:46:05 stephena Exp $ */ class FBSurfaceSoft : public FBSurface { diff --git a/stella/src/debugger/RiotDebug.cxx b/stella/src/debugger/RiotDebug.cxx index 5dc311b23..37d537900 100644 --- a/stella/src/debugger/RiotDebug.cxx +++ b/stella/src/debugger/RiotDebug.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: RiotDebug.cxx,v 1.6 2008-05-15 18:59:56 stephena Exp $ +// $Id: RiotDebug.cxx,v 1.7 2008-11-02 16:46:05 stephena Exp $ //============================================================================ #include @@ -265,7 +265,7 @@ string RiotDebug::dirP0String() << (reg & 0x40 ? "" : "left ") << (reg & 0x20 ? "" : "left ") << (reg & 0x10 ? "" : "left ") - << (reg & 0xf0 == 0xf0 ? "(no directions) " : ""); + << ((reg & 0xf0) == 0xf0 ? "(no directions) " : ""); return buf.str(); } @@ -278,7 +278,7 @@ string RiotDebug::dirP1String() << (reg & 0x04 ? "" : "left ") << (reg & 0x02 ? "" : "left ") << (reg & 0x01 ? "" : "left ") - << (reg & 0x0f == 0x0f ? "(no directions) " : ""); + << ((reg & 0x0f) == 0x0f ? "(no directions) " : ""); return buf.str(); } diff --git a/stella/src/emucore/Cart.cxx b/stella/src/emucore/Cart.cxx index 442e00670..3bd1df680 100644 --- a/stella/src/emucore/Cart.cxx +++ b/stella/src/emucore/Cart.cxx @@ -13,10 +13,11 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: Cart.cxx,v 1.42 2008-05-16 23:56:21 stephena Exp $ +// $Id: Cart.cxx,v 1.43 2008-11-02 16:46:05 stephena Exp $ //============================================================================ #include +#include #include #include "bspf.hxx" diff --git a/stella/src/emucore/M6532.cxx b/stella/src/emucore/M6532.cxx index 1ef359088..3894a6bff 100644 --- a/stella/src/emucore/M6532.cxx +++ b/stella/src/emucore/M6532.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: M6532.cxx,v 1.28 2008-08-01 12:16:00 stephena Exp $ +// $Id: M6532.cxx,v 1.29 2008-11-02 16:46:05 stephena Exp $ //============================================================================ #include @@ -191,7 +191,7 @@ uInt8 M6532::peek(uInt16 addr) case 0x05: // Interrupt Flag case 0x07: { - if((timerClocks() >= 0) || myInterruptEnabled && myInterruptTriggered) + if((timerClocks() >= 0) || (myInterruptEnabled && myInterruptTriggered)) return 0x00; else return 0x80; diff --git a/stella/src/emucore/m6502/src/bspf/src/bspf.hxx b/stella/src/emucore/m6502/src/bspf/src/bspf.hxx index f8f53f617..cd6e0d631 100644 --- a/stella/src/emucore/m6502/src/bspf/src/bspf.hxx +++ b/stella/src/emucore/m6502/src/bspf/src/bspf.hxx @@ -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.19 2008-07-22 14:54:39 stephena Exp $ +// $Id: bspf.hxx,v 1.20 2008-11-02 16:46:05 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.19 2008-07-22 14:54:39 stephena Exp $ + @version $Id: bspf.hxx,v 1.20 2008-11-02 16:46:05 stephena Exp $ */ // Types for 8-bit signed and unsigned integers @@ -51,7 +51,9 @@ typedef unsigned int uInt32; #include using namespace std; #endif - + +#include + #ifdef HAVE_INTTYPES #include #endif