remove unused 'drawWidth/drawHeight' arguments

fcore/level/player/player-vec.sml

@@ -25,14 +25,14 @@ struct
     , PlayerWalkLeft8.lerp
     ]
 
-  fun getIdle (player, rx, ry, dw, dh, ww, wh) =
+  fun getIdle (player, rx, ry, ww, wh) =
     case #facing player of
       FACING_RIGHT =>
         PlayerStandingRight.lerp (rx, ry, 3.0, ww, wh)
     | FACING_LEFT =>
         PlayerStandingLeft.lerp (rx, ry, 3.0, ww, wh)
 
-  fun getWalk (rx, ry, dw, dh, ww, wh, walkFrames, animTimer) =
+  fun getWalk (rx, ry, ww, wh, walkFrames, animTimer) =
     let
       val frame = (animTimer div 4) mod Vector.length walkFrames
       val func = Vector.sub (walkFrames, Int.max (frame, 0))
@@ -40,15 +40,15 @@ struct
       func (rx, ry, 3.0, ww, wh)
     end
 
-  fun getWhenOnGround (player, rx, ry, dw, dh, ww, wh) =
+  fun getWhenOnGround (player, rx, ry, ww, wh) =
     case #xAxis player of
       MOVE_RIGHT =>
-        getWalk (rx, ry, dw, dh, ww, wh, walkRightFrames, #animTimer player)
+        getWalk (rx, ry, ww, wh, walkRightFrames, #animTimer player)
     | MOVE_LEFT =>
-        getWalk (rx, ry, dw, dh, ww, wh, walkLeftFrames, #animTimer player)
-    | STAY_STILL => getIdle (player, rx, ry, dw, dh, ww, wh)
+        getWalk (rx, ry, ww, wh, walkLeftFrames, #animTimer player)
+    | STAY_STILL => getIdle (player, rx, ry, ww, wh)
 
-  fun getWhenJumpingRight (player, amt, rx, ry, dw, dh, ww, wh) =
+  fun getWhenJumpingRight (player, amt, rx, ry, ww, wh) =
     if amt < 3 then
       PlayerJumpRight1.lerp 
         (rx, ry, 3.0, ww, wh)
@@ -65,7 +65,7 @@ struct
       PlayerJumpRight5.lerp
         (rx, ry, 3.0, ww, wh)
 
-  fun getWhenJumpingLeft (player, amt, rx, ry, dw, dh, ww, wh) =
+  fun getWhenJumpingLeft (player, amt, rx, ry, ww, wh) =
     if amt < 3 then
       PlayerJumpLeft1.lerp 
         (rx, ry, 3.0, ww, wh)
@@ -82,12 +82,12 @@ struct
       PlayerJumpLeft5.lerp
         (rx, ry, 3.0, ww, wh)
 
-  fun getWhenJumping (player, amt, rx, ry, dw, dh, ww, wh) =
+  fun getWhenJumping (player, amt, rx, ry, ww, wh) =
     case #facing player of
-      FACING_RIGHT => getWhenJumpingRight (player, amt, rx, ry, dw, dh, ww, wh)
-    | FACING_LEFT => getWhenJumpingLeft (player, amt, rx, ry, dw, dh, ww, wh)
+      FACING_RIGHT => getWhenJumpingRight (player, amt, rx, ry, ww, wh)
+    | FACING_LEFT => getWhenJumpingLeft (player, amt, rx, ry, ww, wh)
 
-  fun getWhenFalling (player, rx, ry, dw, dh, ww, wh) =
+  fun getWhenFalling (player, rx, ry, ww, wh) =
     case #facing player of
       FACING_RIGHT =>
         PlayerJumpRight5.lerp
@@ -96,22 +96,22 @@ struct
         PlayerJumpLeft5.lerp
           (rx, ry, 3.0, ww, wh)
 
-  fun getWhenDropping (player, rx, ry, dw, dh, ww, wh) =
+  fun getWhenDropping (player, rx, ry, ww, wh) =
     let
       val animTimer = #animTimer player
     in
-      getWhenJumping (player, animTimer, rx, ry, dw, dh, ww, wh)
+      getWhenJumping (player, animTimer, rx, ry, ww, wh)
     end
 
-  fun getWhenNotAttacked (player, rx, ry, dw, dh, ww, wh) =
+  fun getWhenNotAttacked (player, rx, ry, ww, wh) =
     case #yAxis player of
-      ON_GROUND => getWhenOnGround (player, rx, ry, dw, dh, ww, wh)
-    | JUMPING amt => getWhenJumping (player, amt, rx, ry, dw, dh, ww, wh)
-    | FALLING => getWhenFalling (player, rx, ry, dw, dh, ww, wh)
-    | FLOATING _ => getWhenFalling (player, rx, ry, dw, dh, ww, wh)
-    | DROP_BELOW_PLATFORM => getWhenDropping (player, rx, ry, dw, dh, ww, wh)
+      ON_GROUND => getWhenOnGround (player, rx, ry, ww, wh)
+    | JUMPING amt => getWhenJumping (player, amt, rx, ry, ww, wh)
+    | FALLING => getWhenFalling (player, rx, ry, ww, wh)
+    | FLOATING _ => getWhenFalling (player, rx, ry, ww, wh)
+    | DROP_BELOW_PLATFORM => getWhenDropping (player, rx, ry, ww, wh)
 
-  fun getWhenAttacked (player, amt, rx, ry, dw, dh, ww, wh) =
+  fun getWhenAttacked (player, amt, rx, ry, ww, wh) =
     case #facing player of
       FACING_RIGHT =>
         (* todo: hurt sprite/animation if amt mod 5 = 0 then *)
@@ -121,7 +121,7 @@ struct
         PlayerStandingLeft.lerp (rx, ry, 3.0, ww, wh)
 
   fun helpGet
-    (player: player, rx, ry, drawWidth, drawHeight, windowWidth, windowHeight) =
+    (player: player, rx, ry, windowWidth, windowHeight) =
     case #mainAttack player of
       MAIN_ATTACKING amt =>
       let
@@ -147,15 +147,13 @@ struct
       case #attacked player of
         NOT_ATTACKED =>
           getWhenNotAttacked
-            (player, rx, ry, drawWidth, drawHeight, windowWidth, windowHeight)
+            (player, rx, ry, windowWidth, windowHeight)
       | ATTACKED amt =>
           getWhenAttacked
             ( player
             , amt
             , rx
             , ry
-            , drawWidth
-            , drawHeight
             , windowWidth
             , windowHeight
             )
@@ -176,11 +174,8 @@ struct
 
           val x = Real32.fromInt x * wratio
           val y = Real32.fromInt y * wratio + yOffset
-
-          val realWidth = Constants.playerWidthReal * wratio
-          val realHeight = Constants.playerHeightReal * wratio
         in
-          helpGet (player, x, y, realWidth, realHeight, width, height)
+          helpGet (player, x, y, width, height)
         end
       else
         let
@@ -192,11 +187,8 @@ struct
 
           val x = Real32.fromInt x * hratio + xOffset
           val y = Real32.fromInt y * hratio
-
-          val realWidth = Constants.playerWidthReal * hratio
-          val realHeight = Constants.playerHeightReal * hratio
         in
-          helpGet (player, x, y, realWidth, realHeight, width, height)
+          helpGet (player, x, y, width, height)
         end
     end
 end