diff options
| author | Craig Robbins <kde.psych@gmail.com> | 2015-03-06 20:21:51 +1000 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2015-03-07 22:41:47 +1000 |
| commit | ced6d20295a8263757d57c02a07ffcb66688a163 (patch) | |
| tree | a44527357c1ffccb88bf479686735aef168d15c1 /src/itemdef.cpp | |
| parent | a603a767877b94b4d3bc4d3de8d762fbc56a583d (diff) | |
| download | minetest-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/itemdef.cpp')
| -rw-r--r-- | src/itemdef.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/itemdef.cpp b/src/itemdef.cpp index 381773bb4..65ba356f4 100644 --- a/src/itemdef.cpp +++ b/src/itemdef.cpp @@ -321,7 +321,7 @@ public: <<name<<"\""<<std::endl; // This is not thread-safe - assert(get_current_thread_id() == m_main_thread); + sanity_check(get_current_thread_id() == m_main_thread); // Skip if already in cache ClientCached *cc = NULL; @@ -544,7 +544,7 @@ public: verbosestream<<"ItemDefManager: registering \""<<def.name<<"\""<<std::endl; // Ensure that the "" item (the hand) always has ToolCapabilities if(def.name == "") - assert(def.tool_capabilities != NULL); + FATAL_ERROR_IF(!def.tool_capabilities, "Hand does not have ToolCapabilities"); if(m_item_definitions.count(def.name) == 0) m_item_definitions[def.name] = new ItemDefinition(def); |