summaryrefslogtreecommitdiffstats
path: root/src/core/common.h
diff options
context:
space:
mode:
authorFire_Head <Fire-Head@users.noreply.github.com>2020-06-29 10:23:02 +0200
committerGitHub <noreply@github.com>2020-06-29 10:23:02 +0200
commita01fe76db72a8890f56da21c9e04503f487e7654 (patch)
treebdab5315528220a05436eeb81756784ac74930b9 /src/core/common.h
parentMerge remote-tracking branch 'upstream/master' (diff)
parentUpdate MBlur.cpp (diff)
downloadre3-a01fe76db72a8890f56da21c9e04503f487e7654.tar
re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar.gz
re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar.bz2
re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar.lz
re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar.xz
re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar.zst
re3-a01fe76db72a8890f56da21c9e04503f487e7654.zip
Diffstat (limited to 'src/core/common.h')
-rw-r--r--src/core/common.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/core/common.h b/src/core/common.h
index 196c3cd7..4bf1aebd 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -103,6 +103,8 @@ inline uint32 ldb(uint32 p, uint32 s, uint32 w)
#define DEFAULT_SCREEN_WIDTH (640)
#define DEFAULT_SCREEN_HEIGHT (448)
+#define DEFAULT_SCREEN_HEIGHT_PAL (512)
+#define DEFAULT_SCREEN_HEIGHT_NTSC (448)
#define DEFAULT_ASPECT_RATIO (4.0f/3.0f)
#define DEFAULT_VIEWWINDOW (0.7f)
@@ -153,6 +155,16 @@ public:
CRGBA(void) { }
CRGBA(uint8 r, uint8 g, uint8 b, uint8 a) : r(r), g(g), b(b), a(a) { }
+ bool operator ==(const CRGBA &right)
+ {
+ return this->r == right.r && this->g == right.g && this->b == right.b && this->a == right.a;
+ }
+
+ bool operator !=(const CRGBA &right)
+ {
+ return !(*this == right);
+ }
+
CRGBA &operator =(const CRGBA &right)
{
this->r = right.r;