summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2019-08-15 16:52:12 +0200
committereray orçunus <erayorcunus@gmail.com>2019-08-15 16:54:49 +0200
commit8f18f848363ba71ee74f13f88ac5a6c5da78b3ba (patch)
tree35bac433fe9a98acdaae40c62cb8753ce422aa54 /src/core
parentAnimViewer! (diff)
parentMerge pull request #190 from Fire-Head/master (diff)
downloadre3-8f18f848363ba71ee74f13f88ac5a6c5da78b3ba.tar
re3-8f18f848363ba71ee74f13f88ac5a6c5da78b3ba.tar.gz
re3-8f18f848363ba71ee74f13f88ac5a6c5da78b3ba.tar.bz2
re3-8f18f848363ba71ee74f13f88ac5a6c5da78b3ba.tar.lz
re3-8f18f848363ba71ee74f13f88ac5a6c5da78b3ba.tar.xz
re3-8f18f848363ba71ee74f13f88ac5a6c5da78b3ba.tar.zst
re3-8f18f848363ba71ee74f13f88ac5a6c5da78b3ba.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Placeable.h4
-rw-r--r--src/core/common.h18
2 files changed, 19 insertions, 3 deletions
diff --git a/src/core/Placeable.h b/src/core/Placeable.h
index c3932572..2df26a7c 100644
--- a/src/core/Placeable.h
+++ b/src/core/Placeable.h
@@ -25,6 +25,4 @@ public:
bool IsWithinArea(float x1, float y1, float x2, float y2);
bool IsWithinArea(float x1, float y1, float z1, float x2, float y2, float z2);
};
-static_assert(sizeof(CPlaceable) == 0x4C, "CPlaceable: error");
-
-
+static_assert(sizeof(CPlaceable) == 0x4C, "CPlaceable: error"); \ No newline at end of file
diff --git a/src/core/common.h b/src/core/common.h
index 2b4c466a..36f67bfa 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -118,6 +118,15 @@ public:
CRGBA(void) { }
CRGBA(uint8 r, uint8 g, uint8 b, uint8 a) : r(r), g(g), b(b), a(a) { }
+
+ CRGBA &CRGBA::operator =(const CRGBA &right)
+ {
+ this->r = right.r;
+ this->g = right.g;
+ this->b = right.b;
+ this->a = right.a;
+ return *this;
+ }
#ifdef RWCORE_H
operator RwRGBA &(void) {
return rwRGBA;
@@ -130,6 +139,15 @@ public:
operator RwRGBA (void) const {
return rwRGBA;
}
+
+ CRGBA &CRGBA::operator =(const RwRGBA &right)
+ {
+ this->r = right.red;
+ this->g = right.green;
+ this->b = right.blue;
+ this->a = right.alpha;
+ return *this;
+ }
#endif
};