mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-10-13 09:10:33 +00:00
Code Issues Projects Releases Wiki Activity

couple of fixes

Browse source
This commit is contained in:
aap 2019-07-20 14:39:38 +02:00
commit 60045ec6cd
9 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core/Collision.cpp
View file

@ -1357,6 +1357,7 @@ CCollision::DistToLine(const CVector *l0, const CVector *l1, const CVector *poin
void
CCollision::CalculateTrianglePlanes(CColModel *model)
{
assert(model);
if(model->numTriangles == 0)
return;
@ -1367,7 +1368,6 @@ CCollision::CalculateTrianglePlanes(CColModel *model)
lptr->Remove();
ms_colModelCache.head.Insert(lptr);
}else{
assert(model);
lptr = ms_colModelCache.Insert(model);
if(lptr == nil){
// make room if we have to, remove last in list

6
src/core/FileLoader.cpp
View file

@ -361,10 +361,10 @@ CFileLoader::LoadClumpFile(const char *filename)
nodename = GetFrameNodeName(RpClumpGetFrame(clump));
GetNameAndLOD(nodename, name, &n);
mi = (CClumpModelInfo*)CModelInfo::GetModelInfo(name, nil);
assert(mi->IsClump());
if(mi)
if(mi){
assert(mi->IsClump());
mi->SetClump(clump);
else
}else
RpClumpDestroy(clump);
}
}

2
src/core/Pad.cpp
View file

@ -1824,7 +1824,7 @@ char *CPad::EditString(char *pStr, int32 nSize)
}
// numbers
for ( int32 i = 0; i < ('0' - '9' + 1); i++ )
for ( int32 i = 0; i < ('9' - '0' + 1); i++ )
{
if ( GetPad(0)->GetCharJustDown(i + '0') && pos < nSize - 1 )
{