mirror of
https://github.com/GTAmodding/re3.git
synced 2025-07-15 08:04:08 +00:00
Merge branch 'miami' into lcs
# Conflicts: # src/control/Script.h # src/modelinfo/SimpleModelInfo.cpp # src/modelinfo/VehicleModelInfo.cpp # src/rw/VisibilityPlugins.cpp # src/rw/VisibilityPlugins.h
This commit is contained in:
commit
9647901ba0
58 changed files with 565 additions and 267 deletions
|
@ -1288,7 +1288,7 @@ CPhysical::ProcessShiftSectorList(CPtrList *lists)
|
|||
int numCollisions;
|
||||
int mostColliding;
|
||||
CColPoint colpoints[MAX_COLLISION_POINTS];
|
||||
CVector shift = { 0.0f, 0.0f, 0.0f };
|
||||
CVector shift = CVector(0.0f, 0.0f, 0.0f);
|
||||
bool doShift = false;
|
||||
CEntity *boat = nil;
|
||||
|
||||
|
@ -1747,8 +1747,8 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
|
|||
if(numCollisions <= 0)
|
||||
continue;
|
||||
|
||||
CVector moveSpeed = { 0.0f, 0.0f, 0.0f };
|
||||
CVector turnSpeed = { 0.0f, 0.0f, 0.0f };
|
||||
CVector moveSpeed = CVector(0.0f, 0.0f, 0.0f);
|
||||
CVector turnSpeed = CVector(0.0f, 0.0f, 0.0f);
|
||||
float maxImpulseA = 0.0f;
|
||||
numResponses = 0;
|
||||
if(A->bHasContacted){
|
||||
|
@ -2232,8 +2232,8 @@ CPhysical::ProcessCollision(void)
|
|||
}else if(IsObject() && ((CObject*)this)->ObjectCreatedBy != TEMP_OBJECT){
|
||||
int responsecase = ((CObject*)this)->m_nSpecialCollisionResponseCases;
|
||||
if(responsecase == COLLRESPONSE_LAMPOST){
|
||||
CVector speedUp = { 0.0f, 0.0f, 0.0f };
|
||||
CVector speedDown = { 0.0f, 0.0f, 0.0f };
|
||||
CVector speedUp = CVector(0.0f, 0.0f, 0.0f);
|
||||
CVector speedDown = CVector(0.0f, 0.0f, 0.0f);
|
||||
CColModel *colModel = GetColModel();
|
||||
speedUp.z = colModel->boundingBox.max.z;
|
||||
speedDown.z = colModel->boundingBox.min.z;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue