Fix GCC warnings. Patch contributed by Milek7.

oitofelix · Apr 1, 2017 · 95e74ec · 95e74ec
1 parent 1204a58
commit 95e74ec
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/cutscenes.c b/src/cutscenes.c
@@ -205,7 +205,8 @@ title_anim (void)
     }
     break;
   case 9:
-    if (! is_video_effect_started ()) i++; break;
+    if (! is_video_effect_started ()) i++;
+    break;
   case 10:
     if (! is_audio_instance_playing (ai_data)) {
       princess.f.c.x = 142;

diff --git a/src/level.c b/src/level.c
@@ -146,7 +146,7 @@ level_eq (struct level *l0, struct level *l1)
       || l0->start_dir != l1->start_dir
       || l0->has_sword != l1->has_sword
       || l0->em != l1->em
-      || l1->hue != l1->hue)
+      || l0->hue != l1->hue)
     return false;
 
   size_t i;

diff --git a/src/multi-room.c b/src/multi-room.c
@@ -484,13 +484,17 @@ mr_view_trans (enum dir d)
 
   switch (d) {
   case RIGHT:
-    if (mr.x > 0) dx = -1; break;
+    if (mr.x > 0) dx = -1;
+    break;
   case LEFT:
-    if (mr.x < mr.w - 1) dx = +1; break;
+    if (mr.x < mr.w - 1) dx = +1;
+    break;
   case BELOW:
-    if (mr.y > 0) dy = -1; break;
+    if (mr.y > 0) dy = -1;
+    break;
   case ABOVE:
-    if (mr.y < mr.h - 1) dy = +1; break;
+    if (mr.y < mr.h - 1) dy = +1;
+    break;
   }
 
   mr_set_origin (mr.room, mr.x + dx, mr.y + dy);