Merge branch 'early_return' of https://github.com/argrath/NetHack into NetHack-3.7

src/pray.c

@@ -1914,7 +1914,8 @@ offer_corpse(struct obj *otmp, boolean highaltar, aligntyp altaralign)
     if (your_race(ptr)) {
         sacrifice_your_race(otmp, highaltar, altaralign);
         return;
-    } else if (has_omonst(otmp)
+    }
+    if (has_omonst(otmp)
                && (mtmp = get_mtraits(otmp, FALSE)) != 0
                && mtmp->mtame) {
             /* mtmp is a temporary pointer to a tame monster's attributes,
@@ -1924,11 +1925,13 @@ offer_corpse(struct obj *otmp, boolean highaltar, aligntyp altaralign)
         HAggravate_monster |= FROMOUTSIDE;
         offer_negative_valued(highaltar, altaralign);
         return;
-    } else if (!value) {
+    }
+    if (!value) {
         /* too old; don't give undead or unicorn bonus or penalty */
         pline1(nothing_happens);
         return;
-    } else if (is_undead(ptr)) { /* Not demons--no demon corpses */
+    }
+    if (is_undead(ptr)) { /* Not demons--no demon corpses */
         /* most undead that leave a corpse yield 'human' (or other race)
            corpse so won't get here; the exception is wraith; give the
            bonus for wraith to chaotics too because they are sacrificing
@@ -1976,11 +1979,13 @@ offer_corpse(struct obj *otmp, boolean highaltar, aligntyp altaralign)
 
     if (altaralign != u.ualign.type && highaltar) {
         desecrate_altar(highaltar, altaralign);
-    } else if (u.ualign.type != altaralign) {
+        return;
+    }
+    if (u.ualign.type != altaralign) {
         /* Sacrificing at an altar of a different alignment */
         offer_different_alignment_altar(otmp, altaralign);
         return;
-    } else {
+    }
     consume_offering(otmp);
     /* OK, you get brownie points. */
     if (u.ugangr) {
@@ -2059,7 +2064,6 @@ offer_corpse(struct obj *otmp, boolean highaltar, aligntyp altaralign)
         }
     }
 }
-}
 
 /* determine prayer results in advance; also used for enlightenment */
 boolean