mirror-games/dca3-game
1
0
Fork 0
mirror of https://gitlab.com/skmp/dca3-game.git synced 2025-09-01 02:41:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

ColModel / Triangle planes: more fixes for miami and liberty

Browse Source
This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis
2025-03-23 08:23:35 +02:00
committed by Stefanos Kornilios Mitsis Poiitidis
parent 3b7f5cffc3
commit 1c12637506
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/liberty/collision/ColModel.cpp
View File

@@ -2,6 +2,7 @@
#include "ColModel.h" #include "ColModel.h"
#include "Game.h" #include "Game.h"
#include "MemoryHeap.h" #include "MemoryHeap.h"
#include "Collision.h"
void* re3StreamingAlloc(size_t size); void* re3StreamingAlloc(size_t size);
@@ -24,12 +25,12 @@ CColModel::CColModel(void)
CColModel::~CColModel(void) CColModel::~CColModel(void)
{ {
RemoveCollisionVolumes(); RemoveCollisionVolumes();
RemoveTrianglePlanes();
} }
void void
CColModel::RemoveCollisionVolumes(void) CColModel::RemoveCollisionVolumes(void)
{ {
CCollision::RemoveTrianglePlanes(this);
if(ownsCollisionVolumes){ if(ownsCollisionVolumes){
RwFree(spheres); RwFree(spheres);
RwFree(lines); RwFree(lines);
@@ -95,6 +96,8 @@ CColModel::operator=(const CColModel &other)
int i; int i;
int numVerts; int numVerts;
CCollision::RemoveTrianglePlanes(this);
boundingSphere = other.boundingSphere; boundingSphere = other.boundingSphere;
boundingBox = other.boundingBox; boundingBox = other.boundingBox;

2
src/liberty/core/FileLoader.cpp
View File

@@ -223,7 +223,7 @@ CFileLoader::LoadCollisionFile(const char *filename)
mi = CModelInfo::GetModelInfo(modelname, nil); mi = CModelInfo::GetModelInfo(modelname, nil);
if(mi){ if(mi){
if(mi->GetColModel()){ if(mi->GetColModel() && mi->DoesOwnColModel()){
LoadCollisionModel(work_buff+24, *mi->GetColModel(), modelname); LoadCollisionModel(work_buff+24, *mi->GetColModel(), modelname);
}else{ }else{
CColModel *model = new CColModel; CColModel *model = new CColModel;

4
src/miami/collision/ColModel.cpp
View File

@@ -45,13 +45,13 @@ CColModel::operator delete(void *p, size_t) throw()
void void
CColModel::RemoveCollisionVolumes(void) CColModel::RemoveCollisionVolumes(void)
{ {
CCollision::RemoveTrianglePlanes(this);
if(ownsCollisionVolumes){ if(ownsCollisionVolumes){
RwFree(spheres); RwFree(spheres);
RwFree(lines); RwFree(lines);
RwFree(boxes); RwFree(boxes);
RwFree(vertices); RwFree(vertices);
RwFree(triangles); RwFree(triangles);
CCollision::RemoveTrianglePlanes(this);
} }
numSpheres = 0; numSpheres = 0;
numLines = 0; numLines = 0;
@@ -111,6 +111,8 @@ CColModel::operator=(const CColModel &other)
int i; int i;
int numVerts; int numVerts;
CCollision::RemoveTrianglePlanes(this);
boundingSphere = other.boundingSphere; boundingSphere = other.boundingSphere;
boundingBox = other.boundingBox; boundingBox = other.boundingBox;