libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-15 08:39:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CGE2: Rework FXP::Joined().

Browse Source 
This commit hopefully silence a great wall of GCC warnings.
This commit is contained in:
uruk 2014-06-28 21:38:21 +02:00
parent 69c8871c3f
commit f69ee470ed
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
engines/cge2/vga13h.h
View File

@ -55,13 +55,22 @@ namespace CGE2 {
class FXP { // fixed point
uint16 f;
int16 i;
long& Joined() const { return *(long *)&f; }
long getJoined() const {
long ret = 0;
ret += f;
ret += i << 16;
return ret;
}
void setJoined(long joined) {
i = joined >> 16;
f = joined;
}
public:
FXP (void): f(0), i(0) { }
FXP (int i0, int f0 = 0) : i(i0), f(0) { }
FXP& operator = (const int& x) { i = x; f = 0; return *this; }
FXP operator + (const FXP& x) const { FXP y; y.Joined() = Joined() + x.Joined(); return y; }
FXP operator - (const FXP& x) const { FXP y; y.Joined() = Joined() - x.Joined(); return y; }
FXP operator + (const FXP& x) const { FXP y; y.setJoined(getJoined() + x.getJoined()); return y; }
FXP operator - (const FXP& x) const { FXP y; y.setJoined(getJoined() - x.getJoined()); return y; }
FXP operator * (const FXP& x) const {
FXP y; long t;
y.i = i * x.i;
@ -74,7 +83,7 @@ public:
FXP operator / (const FXP& x) const {
FXP y; bool sign = false;
if (!x.empty()) {
long j = Joined(), jx = x.Joined();
long j = getJoined(), jx = x.getJoined();
if (j < 0) {
j = -j;
sign ^= 1;
@ -89,7 +98,7 @@ public:
y.f = unsigned((r << 4) / (jx >> 12));
//------------------
if (sign)
y.Joined() = -y.Joined();
y.setJoined(-y.getJoined());
}
return y;