Sorry - nullptr doesn't work with the default Makefile and I don't trust the rest...
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 19 Oct 2016 19:22:12 +0000 (15:22 -0400)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 19 Oct 2016 19:22:12 +0000 (15:22 -0400)
contrib/bobtoolz/DPatch.cpp

index 5916d7e..be49df4 100644 (file)
@@ -302,7 +302,7 @@ DPatch* DPatch::MergePatches( patch_merge_t merge_info, DPatch *p1, DPatch *p2 )
 
        int newHeight = p1->height + p2->height - 1;
        if ( newHeight > MAX_PATCH_HEIGHT ) {
-               return nullptr;
+               return NULL;
        }
 
        DPatch* newPatch = new DPatch();