Migrate vec to OFVector3D

FossilOrigin-Name: 2e931ae3e1bb8a3ac23d368cfacc7394d07f295bd0bc56a40e0c70190d019d8b
This commit is contained in:
Jonathan Schleifer 2025-03-04 00:14:25 +00:00
parent 4ce99636d3
commit 6f64252d65
15 changed files with 141 additions and 136 deletions

View file

@ -298,15 +298,15 @@ pickup(int n, dynent *d)
if (lastmillis - lastjumppad < 300)
break;
lastjumppad = lastmillis;
vec v = {(int)(char)ents[n].attr3 / 10.0f,
(int)(char)ents[n].attr2 / 10.0f, ents[n].attr1 / 10.0f};
OFVector3D v = OFMakeVector3D((int)(char)ents[n].attr3 / 10.0f,
(int)(char)ents[n].attr2 / 10.0f, ents[n].attr1 / 10.0f);
player1->vel.z = 0;
vadd(player1->vel, v);
playsoundc(S_JUMPPAD);
break;
};
};
};
}
}
}
void
checkitems()
@ -322,13 +322,13 @@ checkitems()
continue;
if (OUTBORD(e.x, e.y))
continue;
vec v = {(float)e.x, (float)e.y,
(float)S(e.x, e.y)->floor + player1->eyeheight};
OFVector3D v = OFMakeVector3D(
e.x, e.y, (float)S(e.x, e.y)->floor + player1->eyeheight);
vdist(dist, t, player1->o, v);
if (dist < (e.type == TELEPORT ? 4 : 2.5))
pickup(i, player1);
};
};
}
}
void
checkquad(int time)