From 60045ec6cd5fe5bd650cf62442283e50d4a4c233 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Sat, 20 Jul 2019 14:39:38 +0200
Subject: couple of fixes

---
 src/core/Collision.cpp  | 2 +-
 src/core/FileLoader.cpp | 6 +++---
 src/core/Pad.cpp        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/core')

diff --git a/src/core/Collision.cpp b/src/core/Collision.cpp
index 9a8adf46..7982e77d 100644
--- a/src/core/Collision.cpp
+++ b/src/core/Collision.cpp
@@ -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
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index 450cc146..14dc91cd 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -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);
 		}
 	}
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index 1db50493..736e1e9d 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -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 )
 		{
-- 
cgit v1.2.3