[Scummvm-cvs-logs] SF.net SVN: scummvm:[52181] scummvm/trunk/engines/sci/engine/kmovement.cpp

[thebluegr at users.sourceforge.net]

Revision: 52181
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52181&view=rev
Author:   thebluegr
Date:     2010-08-18 06:59:31 +0000 (Wed, 18 Aug 2010)

Log Message:
-----------
SCI: Cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kmovement.cpp

Modified: scummvm/trunk/engines/sci/engine/kmovement.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmovement.cpp	2010-08-18 05:27:13 UTC (rev 52180)
+++ scummvm/trunk/engines/sci/engine/kmovement.cpp	2010-08-18 06:59:31 UTC (rev 52181)
@@ -169,8 +169,14 @@
 #define _K_BRESEN_AXIS_X 0
 #define _K_BRESEN_AXIS_Y 1
 
-static void initialize_bresen(SegManager *segMan, int argc, reg_t *argv, reg_t mover, int step_factor, int deltax, int deltay) {
+reg_t kInitBresen(EngineState *s, int argc, reg_t *argv) {
+	SegManager *segMan = s->_segMan;
+	reg_t mover = argv[0];
 	reg_t client = readSelector(segMan, mover, SELECTOR(client));
+
+	int deltax = (int16)readSelectorValue(segMan, mover, SELECTOR(x)) - (int16)readSelectorValue(segMan, client, SELECTOR(x));
+	int deltay = (int16)readSelectorValue(segMan, mover, SELECTOR(y)) - (int16)readSelectorValue(segMan, client, SELECTOR(y));
+	int step_factor = (argc < 1) ? argv[1].toUint16() : 1;
 	int stepx = (int16)readSelectorValue(segMan, client, SELECTOR(xStep)) * step_factor;
 	int stepy = (int16)readSelectorValue(segMan, client, SELECTOR(yStep)) * step_factor;
 	int numsteps_x = stepx ? (ABS(deltax) + stepx - 1) / stepx : 0;
@@ -220,19 +226,7 @@
 	writeSelectorValue(segMan, mover, SELECTOR(b_di), bdi);
 	writeSelectorValue(segMan, mover, SELECTOR(b_i1), i1);
 	writeSelectorValue(segMan, mover, SELECTOR(b_i2), bdi * 2);
-}
 
-reg_t kInitBresen(EngineState *s, int argc, reg_t *argv) {
-	SegManager *segMan = s->_segMan;
-	reg_t mover = argv[0];
-	reg_t client = readSelector(segMan, mover, SELECTOR(client));
-
-	int deltax = (int16)readSelectorValue(segMan, mover, SELECTOR(x)) - (int16)readSelectorValue(segMan, client, SELECTOR(x));
-	int deltay = (int16)readSelectorValue(segMan, mover, SELECTOR(y)) - (int16)readSelectorValue(segMan, client, SELECTOR(y));
-	int step_factor = (argc < 1) ? argv[1].toUint16() : 1;
-
-	initialize_bresen(s->_segMan, argc, argv, mover, step_factor, deltax, deltay);
-
 	return s->r_acc;
 }
 
@@ -486,9 +480,8 @@
 
 		s->r_acc = make_reg(0, angle);
 
-		reg_t params[2] = { make_reg(0, angle), client };
-
 		if (looper.segment) {
+			reg_t params[2] = { make_reg(0, angle), client };
 			invokeSelector(s, looper, SELECTOR(doit), argc, argv, 2, params);
 			return s->r_acc;
 		} else {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.