From: Rudolf Polzer <divVerent@xonotic.org>
Date: Wed, 19 Oct 2016 19:22:12 +0000 (-0400)
Subject: Sorry - nullptr doesn't work with the default Makefile and I don't trust the rest... 
X-Git-Tag: xonotic-v0.8.2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6aa642ef010fc792d98f40cdb7dd7cb1fcbbfda7;p=xonotic%2Fnetradiant.git

Sorry - nullptr doesn't work with the default Makefile and I don't trust the rest of the code to compile with -std=c++11 yet.
---

diff --git a/contrib/bobtoolz/DPatch.cpp b/contrib/bobtoolz/DPatch.cpp
index 5916d7e0..be49df4e 100644
--- a/contrib/bobtoolz/DPatch.cpp
+++ b/contrib/bobtoolz/DPatch.cpp
@@ -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();