From ced6d20295a8263757d57c02a07ffcb66688a163 Mon Sep 17 00:00:00 2001
From: Craig Robbins <kde.psych@gmail.com>
Date: Fri, 6 Mar 2015 20:21:51 +1000
Subject: For usages of assert() that are meant to persist in Release builds
 (when NDEBUG is defined), replace those usages with persistent alternatives

---
 src/server.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/server.cpp')

diff --git a/src/server.cpp b/src/server.cpp
index 09884f1bc..de23820dd 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1306,7 +1306,7 @@ Inventory* Server::getInventory(const InventoryLocation &loc)
 	}
 		break;
 	default:
-		assert(0);
+		sanity_check(false); // abort
 		break;
 	}
 	return NULL;
@@ -1345,7 +1345,7 @@ void Server::setInventoryModified(const InventoryLocation &loc)
 	}
 		break;
 	default:
-		assert(0);
+		sanity_check(false); // abort
 		break;
 	}
 }
@@ -1454,7 +1454,7 @@ void Server::handlePeerChanges()
 			break;
 
 		default:
-			assert("Invalid peer change event received!" == 0);
+			FATAL_ERROR("Invalid peer change event received!");
 			break;
 		}
 	}
@@ -2637,8 +2637,8 @@ void Server::UpdateCrafting(Player* player)
 
 	// Put the new preview in
 	InventoryList *plist = player->inventory.getList("craftpreview");
-	assert(plist);
-	assert(plist->getSize() >= 1);
+	sanity_check(plist);
+	sanity_check(plist->getSize() >= 1);
 	plist->changeItem(0, preview);
 }
 
@@ -3026,7 +3026,7 @@ Inventory* Server::createDetachedInventory(const std::string &name)
 		infostream<<"Server creating detached inventory \""<<name<<"\""<<std::endl;
 	}
 	Inventory *inv = new Inventory(m_itemdef);
-	assert(inv);
+	sanity_check(inv);
 	m_detached_inventories[name] = inv;
 	//TODO find a better way to do this
 	sendDetachedInventory(name,PEER_ID_INEXISTENT);
-- 
cgit v1.2.3