Adjust PR

Zylann · Feb 14, 2020 · 40e3fdc · 40e3fdc
1 parent 24841e9
commit 40e3fdc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/generators/voxel_generator_test.cpp b/generators/voxel_generator_test.cpp
@@ -44,10 +44,13 @@ void VoxelGeneratorTest::generate_block(VoxelBlockRequest &input) {
 			generate_block_flat(**input.voxel_buffer, input.origin_in_voxels, input.lod);
 			break;
 
-		default:
 		case MODE_WAVES:
 			generate_block_waves(**input.voxel_buffer, input.origin_in_voxels, input.lod);
 			break;
+
+		default:
+			CRASH_NOW_MSG("Mode is unrecognized.");
+			break;
 	}
 }
 

diff --git a/meshers/transvoxel/voxel_mesher_transvoxel.cpp b/meshers/transvoxel/voxel_mesher_transvoxel.cpp
@@ -911,7 +911,7 @@ void VoxelMesherTransvoxel::reset_reuse_cells(Vector3i block_size) {
 	for (unsigned int i = 0; i < _cache.size(); ++i) {
 		std::vector<ReuseCell> &deck = _cache[i];
 		deck.resize(deck_area);
-		for (long unsigned int j = 0; j < deck.size(); ++j) {
+		for (size_t j = 0; j < deck.size(); ++j) {
 			deck[j].vertices.fill(-1);
 		}
 	}
@@ -921,7 +921,7 @@ void VoxelMesherTransvoxel::reset_reuse_cells_2d(Vector3i block_size) {
 	for (unsigned int i = 0; i < _cache_2d.size(); ++i) {
 		std::vector<ReuseTransitionCell> &row = _cache_2d[i];
 		row.resize(block_size.x);
-		for (long unsigned int j = 0; j < row.size(); ++j) {
+		for (size_t j = 0; j < row.size(); ++j) {
 			row[j].vertices.fill(-1);
 		}
 	}

diff --git a/streams/voxel_stream_region_files.cpp b/streams/voxel_stream_region_files.cpp
@@ -880,7 +880,7 @@ void VoxelStreamRegionFiles::_convert_files(Meta new_meta) {
 		int lod;
 	};
 
-	ERR_FAIL_COND(old_stream->load_meta() != (int)OK);
+	ERR_FAIL_COND(old_stream->load_meta() != VOXEL_FILE_OK);
 
 	std::vector<PositionAndLod> old_region_list;
 	Meta old_meta = old_stream->_meta;

diff --git a/terrain/voxel_terrain.cpp b/terrain/voxel_terrain.cpp
@@ -901,11 +901,11 @@ void VoxelTerrain::_process() {
 				} else {
 					CRASH_COND(block->voxels.is_null());
 
-					int air_type = 0;
+					uint64_t air_type = 0;
 					if (
 							block->voxels->is_uniform(VoxelBuffer::CHANNEL_TYPE) &&
 							block->voxels->is_uniform(VoxelBuffer::CHANNEL_SDF) &&
-							block->voxels->get_voxel(0, 0, 0, VoxelBuffer::CHANNEL_TYPE) == (uint64_t)air_type) {
+							block->voxels->get_voxel(0, 0, 0, VoxelBuffer::CHANNEL_TYPE) == air_type) {
 
 						// If we got here, it must have been because of scheduling an update
 						CRASH_COND(block->get_mesh_state() != VoxelBlock::MESH_UPDATE_NOT_SENT);