aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/kmovement.cpp
diff options
context:
space:
mode:
authorMax Horn2009-09-02 11:33:25 +0000
committerMax Horn2009-09-02 11:33:25 +0000
commit6c44eafa9768d2b8104ab1b3898ac01527629077 (patch)
tree7818029eee8506190ec5dcd62f7b7980eb676caa /engines/sci/engine/kmovement.cpp
parentad5d918ad5f90cedd3d851cb821d63d6a5de4294 (diff)
downloadscummvm-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/kmovement.cpp')
-rw-r--r--engines/sci/engine/kmovement.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp
index f0420b56a0..bd22527df2 100644
--- a/engines/sci/engine/kmovement.cpp
+++ b/engines/sci/engine/kmovement.cpp
@@ -67,7 +67,7 @@ But the solution resulting from that is a lot more complicated, so we use the ab
Still, what we compute in the end is of course not a real velocity anymore, but an integer approximation,
used in an iterative stepping algorithm
*/
-reg_t kSetJump(EngineState *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kSetJump(EngineState *s, int, int argc, reg_t *argv) {
SegManager *segManager = s->segmentManager;
// Input data
reg_t object = argv[0];
@@ -218,7 +218,7 @@ static void initialize_bresen(SegManager *segManager, int argc, reg_t *argv, reg
PUT_SEL32V(mover, b_i2, bdi * 2);
}
-reg_t kInitBresen(EngineState *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kInitBresen(EngineState *s, int, int argc, reg_t *argv) {
SegManager *segManager = s->segmentManager;
reg_t mover = argv[0];
reg_t client = GET_SEL32(mover, client);
@@ -284,7 +284,7 @@ static void bresenham_autodetect(EngineState *s) {
}
}
-reg_t kDoBresen(EngineState *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kDoBresen(EngineState *s, int, int argc, reg_t *argv) {
SegManager *segManager = s->segmentManager;
reg_t mover = argv[0];
reg_t client = GET_SEL32(mover, client);
@@ -390,11 +390,11 @@ reg_t kDoBresen(EngineState *s, int funct_nr, int argc, reg_t *argv) {
return make_reg(0, completed);
}
-extern void _k_dirloop(reg_t obj, uint16 angle, EngineState *s, int funct_nr, int argc, reg_t *argv);
+extern void _k_dirloop(reg_t obj, uint16 angle, EngineState *s, int argc, reg_t *argv);
int is_heap_object(EngineState *s, reg_t pos);
extern int get_angle(int xrel, int yrel);
-reg_t kDoAvoider(EngineState *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kDoAvoider(EngineState *s, int, int argc, reg_t *argv) {
SegManager *segManager = s->segmentManager;
reg_t avoider = argv[0];
reg_t client, looper, mover;
@@ -512,7 +512,7 @@ reg_t kDoAvoider(EngineState *s, int funct_nr, int argc, reg_t *argv) {
return s->r_acc;
} else {
// No looper? Fall back to DirLoop
- _k_dirloop(client, (uint16)angle, s, funct_nr, argc, argv);
+ _k_dirloop(client, (uint16)angle, s, argc, argv);
}
}