[Scummvm-git-logs] scummvm master -> 0b01e796ec4d7c731e2aad8d1120eba40368c808

[AndywinXp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0b01e796ec SCUMM: BASKETBALL: Revert code readability optimization to fix ball physics


Commit: 0b01e796ec4d7c731e2aad8d1120eba40368c808
    https://github.com/scummvm/scummvm/commit/0b01e796ec4d7c731e2aad8d1120eba40368c808
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-09-16T20:35:17+02:00

Commit Message:
SCUMM: BASKETBALL: Revert code readability optimization to fix ball physics

The ball just stopped having a gravity force towards the ground.
How...? HOW?!

Changed paths:
    engines/scumm/he/basketball/collision/bball_collision.cpp


diff --git a/engines/scumm/he/basketball/collision/bball_collision.cpp b/engines/scumm/he/basketball/collision/bball_collision.cpp
index 60d6981a959..09c6958384b 100644
--- a/engines/scumm/he/basketball/collision/bball_collision.cpp
+++ b/engines/scumm/he/basketball/collision/bball_collision.cpp
@@ -149,37 +149,33 @@ int LogicHEBasketball::u32_userDeinitCourt() {
 }
 
 int LogicHEBasketball::u32_userInitBall(U32FltPoint3D &ballLocation, U32FltVector3D &bellVelocity, int radius, int ballID) {
-	CCollisionBasketball basketBall = _vm->_basketball->_court->_basketBall;
-
-	basketBall._description = "Basketball";
-	basketBall._objectType = kBall;
-	basketBall._objectID = ballID;
-	basketBall.center = ballLocation;
-	basketBall._velocity = bellVelocity;
-	basketBall.radius = radius;
-	basketBall._collisionEfficiency = 1.0F;
-	basketBall._friction = 0;
-	basketBall._ignore = false;
-
-	basketBall.save();
+	_vm->_basketball->_court->_basketBall._description = "Basketball";
+	_vm->_basketball->_court->_basketBall._objectType = kBall;
+	_vm->_basketball->_court->_basketBall._objectID = ballID;
+	_vm->_basketball->_court->_basketBall.center = ballLocation;
+	_vm->_basketball->_court->_basketBall._velocity = bellVelocity;
+	_vm->_basketball->_court->_basketBall.radius = radius;
+	_vm->_basketball->_court->_basketBall._collisionEfficiency = 1.0F;
+	_vm->_basketball->_court->_basketBall._friction = 0;
+	_vm->_basketball->_court->_basketBall._ignore = false;
+
+	_vm->_basketball->_court->_basketBall.save();
 
 	return 1;
 }
 
 int LogicHEBasketball::u32_userInitVirtualBall(U32FltPoint3D &ballLocation, U32FltVector3D &bellVelocity, int radius, int ballID) {
-	CCollisionBasketball virtualBall = _vm->_basketball->_court->_virtualBall;
-
-	virtualBall._description = "Virtual Basketball";
-	virtualBall._objectType = kBall;
-	virtualBall._objectID = ballID;
-	virtualBall.center = ballLocation;
-	virtualBall._velocity = bellVelocity;
-	virtualBall.radius = radius;
-	virtualBall._collisionEfficiency = 1.0F;
-	virtualBall._friction = 0;
-	virtualBall._ignore = false;
-
-	virtualBall.save();
+	_vm->_basketball->_court->_virtualBall._description = "Virtual Basketball";
+	_vm->_basketball->_court->_virtualBall._objectType = kBall;
+	_vm->_basketball->_court->_virtualBall._objectID = ballID;
+	_vm->_basketball->_court->_virtualBall.center = ballLocation;
+	_vm->_basketball->_court->_virtualBall._velocity = bellVelocity;
+	_vm->_basketball->_court->_virtualBall.radius = radius;
+	_vm->_basketball->_court->_virtualBall._collisionEfficiency = 1.0F;
+	_vm->_basketball->_court->_virtualBall._friction = 0;
+	_vm->_basketball->_court->_virtualBall._ignore = false;
+
+	_vm->_basketball->_court->_virtualBall.save();
 
 	return 1;
 }