thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made floating platform multiple-player aware

Browse source
This commit is contained in:
MysterD 2020-08-18 18:46:13 -07:00
parent b8bdac2666
commit f08e6f0806
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/game/behaviors/floating_platform.inc.c
View file

@ -17,12 +17,27 @@ f32 floating_platform_find_home_y(void) {
}
void floating_platform_act_0(void) {
s16 sp6 = (gMarioObject->header.gfx.pos[0] - o->oPosX) * coss(-1*o->oMoveAngleYaw)
+ (gMarioObject->header.gfx.pos[2] - o->oPosZ) * sins(-1*o->oMoveAngleYaw);
s16 sp4 = (gMarioObject->header.gfx.pos[2] - o->oPosZ) * coss(-1*o->oMoveAngleYaw)
- (gMarioObject->header.gfx.pos[0] - o->oPosX) * sins(-1*o->oMoveAngleYaw);
if (gMarioObject->platform == o) {
f32 x = 0;
f32 z = 0;
u8 playersTouched = 0;
for (int i = 0; i < MAX_PLAYERS; i++) {
if (gMarioStates[i].marioObj->platform == o) {
x += gMarioStates[i].marioObj->oPosX;
z += gMarioStates[i].marioObj->oPosZ;
playersTouched++;
}
}
if (playersTouched > 0) {
x /= (f32)playersTouched;
z /= (f32)playersTouched;
s16 sp6 = (x - o->oPosX) * coss(-1*o->oMoveAngleYaw)
+ (z - o->oPosZ) * sins(-1*o->oMoveAngleYaw);
s16 sp4 = (z - o->oPosZ) * coss(-1*o->oMoveAngleYaw)
- (x - o->oPosX) * sins(-1*o->oMoveAngleYaw);
o->oFaceAnglePitch = sp4 * 2;
o->oFaceAngleRoll = -sp6 * 2;
o->oVelY -= 1.0f;