diff options
| author | twinaphex | 2017-08-11 17:43:00 +0200 |
|---|---|---|
| committer | twinaphex | 2017-08-11 17:43:00 +0200 |
| commit | b9c74ceb1352c8f433cf6bf2c446ae07457c5267 (patch) | |
| tree | afd398fed3d08c81957373be55a12284cb932ab6 /source/c4.c | |
| parent | 1aecedc999445e9a27e04f665fd562b576775d08 (diff) | |
| download | snesemu-b9c74ceb1352c8f433cf6bf2c446ae07457c5267.tar.gz snesemu-b9c74ceb1352c8f433cf6bf2c446ae07457c5267.tar.bz2 snesemu-b9c74ceb1352c8f433cf6bf2c446ae07457c5267.zip | |
Start making this suitable for MSVC and C89
Diffstat (limited to 'source/c4.c')
| -rw-r--r-- | source/c4.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/source/c4.c b/source/c4.c index 251493c..04e4d21 100644 --- a/source/c4.c +++ b/source/c4.c @@ -55,14 +55,19 @@ const int16_t C4MulTable[256] = int16_t C4_Sin(int16_t Angle) { + int32_t S; + int16_t AngleS7; + if (Angle < 0) { if (Angle == -32768) return 0; return -C4_Sin(-Angle); } - int16_t AngleS7 = Angle >> 7; - int32_t S = C4SinTable[AngleS7] + (C4MulTable[Angle & 0xff] * C4SinTable[0x80 + AngleS7] >> 15); + + AngleS7 = Angle >> 7; + S = C4SinTable[AngleS7] + (C4MulTable[Angle & 0xff] * C4SinTable[0x80 + AngleS7] >> 15); + if (S > 32767) S = 32767; return (int16_t) S; @@ -70,14 +75,17 @@ int16_t C4_Sin(int16_t Angle) int16_t C4_Cos(int16_t Angle) { + int32_t S; + int16_t AngleS7; + if (Angle < 0) { if (Angle == -32768) return -32768; Angle = -Angle; } - int16_t AngleS7 = Angle >> 7; - int32_t S = C4SinTable[0x80 + AngleS7] - (C4MulTable[Angle & 0xff] * C4SinTable[AngleS7] >> 15); + AngleS7 = Angle >> 7; + S = C4SinTable[0x80 + AngleS7] - (C4MulTable[Angle & 0xff] * C4SinTable[AngleS7] >> 15); if (S < -32768) S = -32767; return (int16_t) S; @@ -104,11 +112,13 @@ const int16_t atantbl[256] = { int16_t _atan2(int16_t x, int16_t y) { + int32_t absAtan; + int32_t x1, y1; if (x == 0) return 0; - int32_t x1 = ABS(x), y1 = ABS(y); - int32_t absAtan; + x1 = ABS(x); + y1 = ABS(y); if (x1 > y1) absAtan = atantbl[(uint8_t)((y1 << 8) / x1)]; |