summaryrefslogtreecommitdiff
path: root/src/server.cpp
diff options
context:
space:
mode:
authorCraig Robbins <kde.psych@gmail.com>2015-03-06 20:21:51 +1000
committerCraig Robbins <kde.psych@gmail.com>2015-03-07 22:41:47 +1000
commitced6d20295a8263757d57c02a07ffcb66688a163 (patch)
treea44527357c1ffccb88bf479686735aef168d15c1 /src/server.cpp
parenta603a767877b94b4d3bc4d3de8d762fbc56a583d (diff)
downloadminetest-ced6d20295a8263757d57c02a07ffcb66688a163.tar.gz
minetest-ced6d20295a8263757d57c02a07ffcb66688a163.tar.bz2
minetest-ced6d20295a8263757d57c02a07ffcb66688a163.zip
For usages of assert() that are meant to persist in Release builds (when NDEBUG is defined), replace those usages with persistent alternatives
Diffstat (limited to 'src/server.cpp')
-rw-r--r--src/server.cpp12
1 files changed, 6 insertions, 6 deletions
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);