Browse Source

nullptr instead of NULL

Matthias Moulin 6 years ago
parent
commit
0535b28908
1 changed files with 1 additions and 1 deletions
  1. 1 1
      code/MDLLoader.cpp

+ 1 - 1
code/MDLLoader.cpp

@@ -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);