mirror of
https://github.com/mwpenny/portal64-still-alive.git
synced 2024-10-20 10:37:37 -04:00
Merge pull request #308 from westonCoder/energy-ball-timer-reset
Ball Resets Lifetime Through Portal
This commit is contained in:
commit
0e51a71b8b
|
@ -108,6 +108,7 @@ void ballInit(struct Ball* ball, struct Vector3* position, struct Vector3* veloc
|
|||
ball->rigidBody.currentRoom = startingRoom;
|
||||
ball->flags = 0;
|
||||
ball->lifetime = ballLifetime;
|
||||
ball->originalLifetime = ballLifetime;
|
||||
|
||||
ball->targetSpeed = sqrtf(vector3MagSqrd(&ball->rigidBody.velocity));
|
||||
|
||||
|
@ -188,6 +189,10 @@ void ballUpdate(struct Ball* ball) {
|
|||
return;
|
||||
}
|
||||
|
||||
if (ball->rigidBody.flags & (RigidBodyFlagsCrossedPortal0 | RigidBodyFlagsCrossedPortal1)){
|
||||
ball->lifetime = ball->originalLifetime;
|
||||
}
|
||||
|
||||
float currentSpeed = sqrtf(vector3MagSqrd(&ball->rigidBody.velocity));
|
||||
|
||||
if (currentSpeed == 0.0f) {
|
||||
|
|
|
@ -27,6 +27,7 @@ struct Ball {
|
|||
|
||||
float targetSpeed;
|
||||
float lifetime;
|
||||
float originalLifetime;
|
||||
short dynamicId;
|
||||
short flags;
|
||||
short soundLoopId;
|
||||
|
|
Loading…
Reference in a new issue