diff options
author | Max Horn | 2009-09-02 11:33:25 +0000 |
---|---|---|
committer | Max Horn | 2009-09-02 11:33:25 +0000 |
commit | 6c44eafa9768d2b8104ab1b3898ac01527629077 (patch) | |
tree | 7818029eee8506190ec5dcd62f7b7980eb676caa /engines/sci/engine/kmath.cpp | |
parent | ad5d918ad5f90cedd3d851cb821d63d6a5de4294 (diff) | |
download | scummvm-rg350-6c44eafa9768d2b8104ab1b3898ac01527629077.tar.gz scummvm-rg350-6c44eafa9768d2b8104ab1b3898ac01527629077.tar.bz2 scummvm-rg350-6c44eafa9768d2b8104ab1b3898ac01527629077.zip |
SCI: funct_nr is not used in 99% of all opcodes -- hide it in those (to be removed eventually)
svn-id: r43905
Diffstat (limited to 'engines/sci/engine/kmath.cpp')
-rw-r--r-- | engines/sci/engine/kmath.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/sci/engine/kmath.cpp b/engines/sci/engine/kmath.cpp index e4c314c605..0382a540ee 100644 --- a/engines/sci/engine/kmath.cpp +++ b/engines/sci/engine/kmath.cpp @@ -28,18 +28,18 @@ namespace Sci { -reg_t kRandom(EngineState *s, int funct_nr, int argc, reg_t *argv) { +reg_t kRandom(EngineState *s, int, int argc, reg_t *argv) { return make_reg(0, argv[0].toSint16() + (int)((argv[1].toSint16() + 1.0 - argv[0].toSint16()) * (rand() / (RAND_MAX + 1.0)))); } -reg_t kAbs(EngineState *s, int funct_nr, int argc, reg_t *argv) { +reg_t kAbs(EngineState *s, int, int argc, reg_t *argv) { // This is a hack, but so is the code in Hoyle1 that needs it. if (argv[0].segment) return make_reg(0, 0x3e8); // Yes people, this is an object return make_reg(0, abs(argv[0].toSint16())); } -reg_t kSqrt(EngineState *s, int funct_nr, int argc, reg_t *argv) { +reg_t kSqrt(EngineState *s, int, int argc, reg_t *argv) { return make_reg(0, (int16) sqrt((float) abs(argv[0].toSint16()))); } @@ -63,7 +63,7 @@ int get_angle(int xrel, int yrel) { } } -reg_t kGetAngle(EngineState *s, int funct_nr, int argc, reg_t *argv) { +reg_t kGetAngle(EngineState *s, int, int argc, reg_t *argv) { // Based on behavior observed with a test program created with // SCI Studio. int x1 = argv[0].toSint16(); @@ -100,7 +100,7 @@ reg_t kGetAngle(EngineState *s, int funct_nr, int argc, reg_t *argv) { return make_reg(0, angle); } -reg_t kGetDistance(EngineState *s, int funct_nr, int argc, reg_t *argv) { +reg_t kGetDistance(EngineState *s, int, int argc, reg_t *argv) { int xdiff = (argc > 3) ? argv[3].toSint16() : 0; int ydiff = (argc > 2) ? argv[2].toSint16() : 0; int angle = (argc > 5) ? argv[5].toSint16() : 0; @@ -109,21 +109,21 @@ reg_t kGetDistance(EngineState *s, int funct_nr, int argc, reg_t *argv) { return make_reg(0, (int16)sqrt((float) xrel*xrel + yrel*yrel)); } -reg_t kTimesSin(EngineState *s, int funct_nr, int argc, reg_t *argv) { +reg_t kTimesSin(EngineState *s, int, int argc, reg_t *argv) { int angle = argv[0].toSint16(); int factor = argv[1].toSint16(); return make_reg(0, (int)(factor * 1.0 * sin(angle * PI / 180.0))); } -reg_t kTimesCos(EngineState *s, int funct_nr, int argc, reg_t *argv) { +reg_t kTimesCos(EngineState *s, int, int argc, reg_t *argv) { int angle = argv[0].toSint16(); int factor = argv[1].toSint16(); return make_reg(0, (int)(factor * 1.0 * cos(angle * PI / 180.0))); } -reg_t kCosDiv(EngineState *s, int funct_nr, int argc, reg_t *argv) { +reg_t kCosDiv(EngineState *s, int, int argc, reg_t *argv) { int angle = argv[0].toSint16(); int value = argv[1].toSint16(); double cosval = cos(angle * PI / 180.0); @@ -135,7 +135,7 @@ reg_t kCosDiv(EngineState *s, int funct_nr, int argc, reg_t *argv) { return make_reg(0, (int16)(value / cosval)); } -reg_t kSinDiv(EngineState *s, int funct_nr, int argc, reg_t *argv) { +reg_t kSinDiv(EngineState *s, int, int argc, reg_t *argv) { int angle = argv[0].toSint16(); int value = argv[1].toSint16(); double sinval = sin(angle * PI / 180.0); @@ -147,7 +147,7 @@ reg_t kSinDiv(EngineState *s, int funct_nr, int argc, reg_t *argv) { return make_reg(0, (int16)(value / sinval)); } -reg_t kTimesTan(EngineState *s, int funct_nr, int argc, reg_t *argv) { +reg_t kTimesTan(EngineState *s, int, int argc, reg_t *argv) { int param = argv[0].toSint16(); int scale = (argc > 1) ? argv[1].toSint16() : 1; @@ -159,7 +159,7 @@ reg_t kTimesTan(EngineState *s, int funct_nr, int argc, reg_t *argv) { return make_reg(0, (int16) - (tan(param * PI / 180.0) * scale)); } -reg_t kTimesCot(EngineState *s, int funct_nr, int argc, reg_t *argv) { +reg_t kTimesCot(EngineState *s, int, int argc, reg_t *argv) { int param = argv[0].toSint16(); int scale = (argc > 1) ? argv[1].toSint16() : 1; |