mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-03-30 07:17:03 +00:00
used scalefactor when it was not used while it should: WOLF scaling, leg animation, shmup
This commit is contained in:
parent
b52097ebe7
commit
676abdf03b
@ -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;
|
||||
|
||||
|
@ -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)) {
|
||||
|
@ -1011,7 +1011,7 @@ void profile(const char *buf) {
|
||||
}
|
||||
*/
|
||||
|
||||
#define SCALE (crossf/hcrossf)
|
||||
#define SCALE scalefactor
|
||||
#define SCALE2 (SCALE*SCALE)
|
||||
|
||||
namespace shmup {
|
||||
|
Loading…
x
Reference in New Issue
Block a user