Revise bump_version.sh script to address shortcomings (#12789)

[minetest.git] / src / emerge.cpp

diff --git a/src/emerge.cpp b/src/emerge.cpp
index e36d364480ba531cfce58ccc6ae4b9e5465c7c20..d58323ed5c2ed4cb74fe4bd45dbf0be5ff259313 100644 (file)
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -504,7 +504,7 @@ EmergeThread *EmergeManager::getOptimalThread()
 
 void EmergeManager::reportCompletedEmerge(EmergeAction action)
 {
-       assert((int)action < ARRLEN(m_completed_emerge_counter));
+       assert((size_t)action < ARRLEN(m_completed_emerge_counter));
        m_completed_emerge_counter[(int)action]->increment();
 }
 
@@ -596,7 +596,7 @@ EmergeAction EmergeThread::getBlockOrStartGen(
 
        // 1). Attempt to fetch block from memory
        *block = m_map->getBlockNoCreateNoEx(pos);
-       if (*block && !(*block)->isDummy()) {
+       if (*block) {
                if ((*block)->isGenerated())
                        return EMERGE_FROM_MEMORY;
        } else {