sydney/SpaceCadetPinball
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WaveMix ready. Fixed ball Z reset in TKickout.

Browse Source
This commit is contained in:
oz committed 2021-01-28 12:46:48 +03:00
1 parent 77f3f52e0d
commit 74306179a7
7 files changed
+300 -47
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

SpaceCadetPinball/TKickout.cpp
+4 -4
View File
@@ -113,9 +113,9 @@ void TKickout::Collision(TBall* ball, vector_type* nextPosition, vector_type* di
KickFlag1 = 1;
ball->CollisionComp = this;
ball->Position.X = Circle.Center.X;
ball->Position.Y = Circle.Center.Y;
ball->Position.Z = CollisionBallSetZ;
FieldBallZSet = ball->Position.Z;
ball->Position.Y = Circle.Center.Y;
OriginalBallZ = ball->Position.Z;
ball->Position.Z = CollisionBallSetZ;
if (PinballTable->TiltLockFlag)
{
Message(55, 0.1f);
@@ -153,7 +153,7 @@ void TKickout::TimerExpired(int timerId, void* caller)
kick->Timer = timer::set(kick->TimerTime2, kick, ResetTimerExpired);
if (kick->Ball)
{
kick->Ball->Position.Z = kick->FieldBallZSet;
kick->Ball->Position.Z = kick->OriginalBallZ;
TBall::throw_ball(kick->Ball, &kick->BallAcceleration, kick->ThrowAngleMult, kick->ThrowSpeedMult1,
kick->ThrowSpeedMult2);
kick->UnknownBaseFlag2 = 0;