summaryrefslogtreecommitdiffstats
path: root/src/core/FileLoader.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-07-27 15:38:12 +0200
committeraap <aap@papnet.eu>2020-07-27 15:38:12 +0200
commit2e8048d0feacbfb5a8e3d75be8d00b3f8d45c3be (patch)
tree2fce94f95b4f39656cc2dc2a76c93573793a3bea /src/core/FileLoader.cpp
parentheli fixes (diff)
downloadre3-2e8048d0feacbfb5a8e3d75be8d00b3f8d45c3be.tar
re3-2e8048d0feacbfb5a8e3d75be8d00b3f8d45c3be.tar.gz
re3-2e8048d0feacbfb5a8e3d75be8d00b3f8d45c3be.tar.bz2
re3-2e8048d0feacbfb5a8e3d75be8d00b3f8d45c3be.tar.lz
re3-2e8048d0feacbfb5a8e3d75be8d00b3f8d45c3be.tar.xz
re3-2e8048d0feacbfb5a8e3d75be8d00b3f8d45c3be.tar.zst
re3-2e8048d0feacbfb5a8e3d75be8d00b3f8d45c3be.zip
Diffstat (limited to 'src/core/FileLoader.cpp')
-rw-r--r--src/core/FileLoader.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index 63be2e7b..b4da1a5e 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -264,12 +264,12 @@ CFileLoader::LoadCollisionModel(uint8 *buf, CColModel &model, char *modelname)
int32 numVertices = *(int16*)buf;
buf += 4;
if(numVertices > 0){
- model.vertices = (CVector*)RwMalloc(numVertices*sizeof(CVector));
+ model.vertices = (CompressedVector*)RwMalloc(numVertices*sizeof(CompressedVector));
for(i = 0; i < numVertices; i++){
- model.vertices[i] = *(CVector*)buf;
- if(Abs(model.vertices[i].x) >= 256.0f ||
- Abs(model.vertices[i].y) >= 256.0f ||
- Abs(model.vertices[i].z) >= 256.0f)
+ model.vertices[i].Set(*(float*)buf, *(float*)(buf+4), *(float*)(buf+8));
+ if(Abs(*(float*)buf) >= 256.0f ||
+ Abs(*(float*)(buf+4)) >= 256.0f ||
+ Abs(*(float*)(buf+8)) >= 256.0f)
printf("%s:Collision volume too big\n", modelname);
buf += 12;
}