diff options
| author | Max Horn | 2009-02-21 21:16:41 +0000 |
|---|---|---|
| committer | Max Horn | 2009-02-21 21:16:41 +0000 |
| commit | ff17899d8ef0a9bf82334819444646b4c323b29e (patch) | |
| tree | 06289cbe5b36c014ea52dc2eb376431d6fc2c9ba /engines/sci/engine/kmath.cpp | |
| parent | 2acb44d1574abb831c99e11f52f6f956d40b6d8b (diff) | |
| download | scummvm-rg350-ff17899d8ef0a9bf82334819444646b4c323b29e.tar.gz scummvm-rg350-ff17899d8ef0a9bf82334819444646b4c323b29e.tar.bz2 scummvm-rg350-ff17899d8ef0a9bf82334819444646b4c323b29e.zip | |
SCI: Got rid of include/scitypes.h
svn-id: r38746
Diffstat (limited to 'engines/sci/engine/kmath.cpp')
| -rw-r--r-- | engines/sci/engine/kmath.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/sci/engine/kmath.cpp b/engines/sci/engine/kmath.cpp index d0695cb0e1..2183b60eff 100644 --- a/engines/sci/engine/kmath.cpp +++ b/engines/sci/engine/kmath.cpp @@ -39,7 +39,7 @@ reg_t kAbs(EngineState *s, int funct_nr, int argc, reg_t *argv) { } reg_t kSqrt(EngineState *s, int funct_nr, int argc, reg_t *argv) { - return make_reg(0, (gint16) sqrt((float) abs(SKPV(0)))); + return make_reg(0, (int16) sqrt((float) abs(SKPV(0)))); } int get_angle(int xrel, int yrel) { @@ -103,7 +103,7 @@ reg_t kGetDistance(EngineState *s, int funct_nr, int argc, reg_t *argv) { int xrel = (int)(((float) SKPV(1) - SKPV_OR_ALT(3, 0)) / cos(SKPV_OR_ALT(5, 0) * PI / 180.0)); // This works because cos(0)==1 int yrel = SKPV(0) - SKPV_OR_ALT(2, 0); - return make_reg(0, (gint16)sqrt((float) xrel*xrel + yrel*yrel)); + return make_reg(0, (int16)sqrt((float) xrel*xrel + yrel*yrel)); } reg_t kTimesSin(EngineState *s, int funct_nr, int argc, reg_t *argv) { @@ -127,9 +127,9 @@ reg_t kCosDiv(EngineState *s, int funct_nr, int argc, reg_t *argv) { if ((cosval < 0.0001) && (cosval > 0.0001)) { warning("Attepted division by zero"); - return make_reg(0, (gint16)0x8000); + return make_reg(0, (int16)0x8000); } else - return make_reg(0, (gint16)(value / cosval)); + return make_reg(0, (int16)(value / cosval)); } reg_t kSinDiv(EngineState *s, int funct_nr, int argc, reg_t *argv) { @@ -139,9 +139,9 @@ reg_t kSinDiv(EngineState *s, int funct_nr, int argc, reg_t *argv) { if ((sinval < 0.0001) && (sinval > 0.0001)) { warning("Attepted division by zero"); - return make_reg(0, (gint16)0x8000); + return make_reg(0, (int16)0x8000); } else - return make_reg(0, (gint16)(value / sinval)); + return make_reg(0, (int16)(value / sinval)); } reg_t kTimesTan(EngineState *s, int funct_nr, int argc, reg_t *argv) { @@ -151,9 +151,9 @@ reg_t kTimesTan(EngineState *s, int funct_nr, int argc, reg_t *argv) { param -= 90; if ((param % 90) == 0) { warning("Attempted tan(pi/2)"); - return make_reg(0, (gint16)0x8000); + return make_reg(0, (int16)0x8000); } else - return make_reg(0, (gint16) - (tan(param * PI / 180.0) * scale)); + return make_reg(0, (int16) - (tan(param * PI / 180.0) * scale)); } reg_t kTimesCot(EngineState *s, int funct_nr, int argc, reg_t *argv) { @@ -162,9 +162,9 @@ reg_t kTimesCot(EngineState *s, int funct_nr, int argc, reg_t *argv) { if ((param % 90) == 0) { warning("Attempted tan(pi/2)"); - return make_reg(0, (gint16)0x8000); + return make_reg(0, (int16)0x8000); } else - return make_reg(0, (gint16)(tan(param * PI / 180.0) * scale)); + return make_reg(0, (int16)(tan(param * PI / 180.0) * scale)); } } // End of namespace Sci |