From 676abdf03bcedd763d2f0550254f10048aa03c89 Mon Sep 17 00:00:00 2001
From: ? <zeno@attnam.com>
Date: Thu, 28 Feb 2019 03:38:22 +0100
Subject: [PATCH] used scalefactor when it was not used while it should: WOLF
 scaling, leg animation, shmup

---
 graph.cpp    | 5 ++++-
 polygons.cpp | 2 +-
 shmup.cpp    | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/graph.cpp b/graph.cpp
index 8c3eb2a6..019aa396 100644
--- a/graph.cpp
+++ b/graph.cpp
@@ -481,6 +481,9 @@ void animallegs(const transmatrix& V, eMonster mo, color_t col, double footphase
   
   if(bug) rightfoot /= 2.5, leftfoot /= 2.5;
   
+  rightfoot *= SCALE;
+  leftfoot *= SCALE;
+  
   if(!footphase) rightfoot = leftfoot = 0;
 
   transmatrix VAML = mmscale(V, geom3::ALEG);
@@ -552,7 +555,7 @@ transmatrix otherbodyparts(const transmatrix& V, color_t col, eMonster who, doub
   // if(!mmspatial && !footphase && who != moSkeleton) return;
   
   footphase /= SCALE;
-  double rightfoot = footfun(footphase / .4 / 2.5) / 4 * 2.5;
+  double rightfoot = footfun(footphase / .4 / 2.5) / 4 * 2.5 * SCALE;
   
   const double wobble = -1;
 
diff --git a/polygons.cpp b/polygons.cpp
index e78d247c..a43ae43d 100644
--- a/polygons.cpp
+++ b/polygons.cpp
@@ -1816,7 +1816,7 @@ void bshape(hpcshape& sh, PPR prio, double shzoom, int shapeid, double bonus = 0
   while(polydata[whereis + 2*qty] != NEWSHAPE) qty++;
   double shzoomx = shzoom;
   double shzoomy = shzoom;
-  if(shzoom == WOLF) shzoomx = 1.5 * (!BITRUNCATED && !archimedean ? crossf / hcrossf : 1), shzoomy = 1.6 * (!BITRUNCATED && !archimedean ? crossf / hcrossf : 1);
+  if(shzoom == WOLF) shzoomx = 1.5 * (!BITRUNCATED && !archimedean ? scalefactor : 1), shzoomy = 1.6 * (!BITRUNCATED && !archimedean ? scalefactor : 1);
   int rots2 = rots;
   // shapes 368..370 are specially designed
   if(!(shapeid >= 368 && shapeid <= 370)) {
diff --git a/shmup.cpp b/shmup.cpp
index 752e8f5d..01f5d9e6 100644
--- a/shmup.cpp
+++ b/shmup.cpp
@@ -1011,7 +1011,7 @@ void profile(const char *buf) {
   }
 */
 
-#define SCALE (crossf/hcrossf)
+#define SCALE scalefactor
 #define SCALE2 (SCALE*SCALE)
 
 namespace shmup {