v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nullptr instead of NULL

pull/2223/head
Matthias Moulin 2018-11-16 12:17:12 +01:00 committed by GitHub
parent 48ee14c64e
commit 0535b28908
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/MDLLoader.cpp
View File

@ -415,7 +415,7 @@ void MDLImporter::InternReadFile_Quake1() {
// FIXME: the cast is wrong and cause a warning on clang 5.0 // FIXME: the cast is wrong and cause a warning on clang 5.0
// disable this code for now, fix it later // disable this code for now, fix it later
ai_assert(false && "Bad pointer cast"); ai_assert(false && "Bad pointer cast");
pcFirstFrame = NULL; pcFirstFrame = nullptr; // Workaround: msvc++ C4703 error
#else #else
BE_NCONST MDL::GroupFrame* pcFrames2 = (BE_NCONST MDL::GroupFrame*)pcFrames; BE_NCONST MDL::GroupFrame* pcFrames2 = (BE_NCONST MDL::GroupFrame*)pcFrames;
pcFirstFrame = (BE_NCONST MDL::SimpleFrame*)(&pcFrames2->time + pcFrames->type); pcFirstFrame = (BE_NCONST MDL::SimpleFrame*)(&pcFrames2->time + pcFrames->type);