summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--editor/imgui-editors.cpp8
-rw-r--r--src/chunk-collision.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/editor/imgui-editors.cpp b/editor/imgui-editors.cpp
index b8794d2c..a0aff447 100644
--- a/editor/imgui-editors.cpp
+++ b/editor/imgui-editors.cpp
@@ -15,10 +15,10 @@ StringView scenery_type_to_string(const scenery_editor::scenery_& sc)
{
switch (sc.proto.sc_type)
{
- case scenery_type::none: return "none"_s; break;
- case scenery_type::generic: return "generic"_s; break;
- case scenery_type::door: return "door"_s; break;
- default: return "unknown"_s; break;
+ case scenery_type::none: return "none"_s;
+ case scenery_type::generic: return "generic"_s;
+ case scenery_type::door: return "door"_s;
+ default: return "unknown"_s;
}
}
diff --git a/src/chunk-collision.cpp b/src/chunk-collision.cpp
index e6d0fe93..49b7bc7d 100644
--- a/src/chunk-collision.cpp
+++ b/src/chunk-collision.cpp
@@ -147,7 +147,7 @@ void chunk::_replace_bbox(const bbox& x0, const bbox& x1, bool b0, bool b1)
case 0 << 1 | 0 << 0:
return;
}
- CORRADE_ASSUME(false); (void)0;
+ CORRADE_ASSUME(false);
}
bool chunk::can_place_entity(const entity_proto& proto, local_coords pos)