Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/stella-emu/stella
Browse files Browse the repository at this point in the history
  • Loading branch information
thrust26 committed Dec 1, 2024
2 parents 28db219 + 0e2ce27 commit e2f59ae
Show file tree
Hide file tree
Showing 21 changed files with 666 additions and 406 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,4 @@ a.out
*.json
*.sqlite3
*.bak
debian/files
1 change: 1 addition & 0 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Maintainer: Stephen Anthony <[email protected]>
Section: otherosfs
Priority: optional
Build-Depends: debhelper (>= 10~),
libgtest-dev,
libpng-dev,
libsdl2-dev,
zlib1g-dev
Expand Down
6 changes: 3 additions & 3 deletions src/common/Rect.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,10 @@ private:

public:
constexpr Rect() = default;
constexpr explicit Rect(const Size& s) : bottom{ s.h }, right{ s.w } { assert(valid()); }
constexpr Rect(uInt32 w, uInt32 h) : bottom{ h }, right{ w } { assert(valid()); }
constexpr explicit Rect(const Size& s) : bottom{s.h}, right{s.w} { assert(valid()); }
constexpr Rect(uInt32 w, uInt32 h) : bottom{h}, right{w} { assert(valid()); }
constexpr Rect(const Point& p, uInt32 w, uInt32 h)
: top(p.y), left(p.x), bottom(p.y + h), right( p.x + w) { assert(valid()); }
: top(p.y), left(p.x), bottom(p.y + h), right(p.x + w) { assert(valid()); }
constexpr Rect(uInt32 x1, uInt32 y1, uInt32 x2, uInt32 y2) : top{y1}, left{x1}, bottom{y2}, right{x2} { assert(valid()); }

constexpr uInt32 x() const { return left; }
Expand Down
Empty file modified src/emucore/CartMVC.cxx
100755 → 100644
Empty file.
Empty file modified src/emucore/CartMVC.hxx
100755 → 100644
Empty file.
Loading

0 comments on commit e2f59ae

Please sign in to comment.