From: Matze B. <mat...@us...> - 2002-03-06 16:21:06
|
Update of /cvsroot/planeshift/planeshift/src/common/psprop/imp In directory usw-pr-cvs1:/tmp/cvs-serv2762/src/common/psprop/imp Modified Files: pslinmove.cpp Log Message: made the correct fix for the SCF warnings Index: pslinmove.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/psprop/imp/pslinmove.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** pslinmove.cpp 6 Mar 2002 02:35:48 -0000 1.8 --- pslinmove.cpp 6 Mar 2002 16:21:02 -0000 1.9 *************** *** 130,133 **** --- 130,137 ---- } + SCF_DEC_REF(topColliderMesh); + SCF_DEC_REF(bottomColliderMesh); + SCF_DEC_REF(topCollider); + SCF_DEC_REF(bottomCollider); SCF_DEC_REF(engine); SCF_DEC_REF(vc); *************** *** 450,455 **** topCollider = new csColliderWrapper( topColliderMesh->QueryObject(), cdsys, mesh); - cdsys->DecRef(); - mesh->DecRef(); --- 454,457 ---- *************** *** 515,519 **** cdsys, mesh); mesh->DecRef(); - cdsys->DecRef(); bottomCollider->SetName("Bottom Collider"); --- 517,520 ---- *************** *** 535,547 **** engine->RemoveObject(bottomColliderMesh); - - /* SCF_DEC_REF(topColliderMesh); - SCF_DEC_REF(bottomColliderMesh); - - SCF_DEC_REF(topCollider); - SCF_DEC_REF(bottomCollider); - */ - - if (result) { --- 536,539 ---- *************** *** 573,587 **** cdsys->ResetCollisionPairs(); ! #if 0 ! if ( collidewrapper->Collide(sector->QueryObject(), transform) ) ! hits++; ! #endif ! ! csCollisionPair* CD_contact; /* = cdsys->GetCollisionPairs();*/ ! ! #if 0 ! for ( i = 0; i < cdsys->GetCollisionPairCount(); i++) ! our_cd_contact[num_our_cd++] = CD_contact[i]; ! #endif //Check collisions with the meshes in this sector --- 565,569 ---- cdsys->ResetCollisionPairs(); ! csCollisionPair* CD_contact; //Check collisions with the meshes in this sector |