archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-05 00:00:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun

Browse Source
This commit is contained in:
eray orçunus
2019-08-15 17:52:12 +03:00
parent 5bea16c7cc 88fcac85d3
commit 8f18f84836
21 changed files with 1983 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/Placeable.h
View File

@ -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");

18
src/core/common.h
View File

@ -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
};