Drop parentheses around scalar values in "return".

1 files changed, 87 insertions, 87 deletions

diff --git a/crawl-ref/source/ng-restr.cc b/crawl-ref/source/ng-restr.cc
index 59ff7b0329..3272d241bf 100644
--- a/crawl-ref/source/ng-restr.cc
+++ b/crawl-ref/source/ng-restr.cc
@@ -32,16 +32,16 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_MUMMY:
         case SP_VAMPIRE:
         case SP_OCTOPODE:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_GLADIATOR:
         switch (speci)
         {
         case SP_FELID:
-            return (CC_BANNED);
+            return CC_BANNED;
         case SP_DEEP_ELF:
         case SP_SLUDGE_ELF:
         case SP_HALFLING:
@@ -54,9 +54,9 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_MUMMY:
         case SP_VAMPIRE:
         case SP_OCTOPODE:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_MONK:
@@ -73,16 +73,16 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_DEMIGOD:
         case SP_MUMMY:
         case SP_OCTOPODE:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_BERSERKER:
         switch (speci)
         {
         case SP_DEMIGOD:
-            return (CC_BANNED);
+            return CC_BANNED;
         case SP_HIGH_ELF:
         case SP_DEEP_ELF:
         case SP_SLUDGE_ELF:
@@ -91,25 +91,25 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_GHOUL:
         case SP_VAMPIRE:
         case SP_OCTOPODE:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_CHAOS_KNIGHT:
         switch (speci)
         {
         case SP_DEMIGOD:
-            return (CC_BANNED);
+            return CC_BANNED;
         default:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         }
 
     case JOB_DEATH_KNIGHT:
         switch (speci)
         {
         case SP_DEMIGOD:
-            return (CC_BANNED);
+            return CC_BANNED;
         case SP_HIGH_ELF:
         case SP_DEEP_ELF:
         case SP_SLUDGE_ELF:
@@ -123,16 +123,16 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_VAMPIRE:
         case SP_FELID:
         case SP_OCTOPODE:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_ABYSSAL_KNIGHT:
         switch (speci)
         {
         case SP_DEMIGOD:
-            return (CC_BANNED);
+            return CC_BANNED;
         case SP_HIGH_ELF:
         case SP_DEEP_ELF:
         case SP_SLUDGE_ELF:
@@ -147,9 +147,9 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_VAMPIRE:
         case SP_FELID:
         case SP_OCTOPODE:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_PRIEST:
@@ -160,7 +160,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_MUMMY:
         case SP_GHOUL:
         case SP_VAMPIRE:
-            return (CC_BANNED);
+            return CC_BANNED;
         case SP_DEEP_ELF:
         case SP_SLUDGE_ELF:
         case SP_DEEP_DWARF:
@@ -176,9 +176,9 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_BASE_DRACONIAN:
         case SP_FELID:
         case SP_OCTOPODE:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_HEALER:
@@ -189,7 +189,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_MUMMY:
         case SP_GHOUL:
         case SP_VAMPIRE:
-            return (CC_BANNED);
+            return CC_BANNED;
         case SP_HIGH_ELF:
         case SP_DEEP_ELF:
         case SP_HALFLING:
@@ -199,9 +199,9 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_TENGU:
         case SP_FELID:
         case SP_OCTOPODE:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_SKALD:
@@ -221,9 +221,9 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_GHOUL:
         case SP_FELID:
         case SP_OCTOPODE:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_WARPER:
@@ -245,9 +245,9 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_GHOUL:
         case SP_VAMPIRE:
         case SP_OCTOPODE:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_WIZARD:
@@ -263,9 +263,9 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_GHOUL:
         case SP_VAMPIRE:
         case SP_FELID:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_CONJURER:
@@ -285,9 +285,9 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_GHOUL:
         case SP_VAMPIRE:
         case SP_FELID:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_ENCHANTER:
@@ -309,9 +309,9 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_GHOUL:
         case SP_FELID:
         case SP_OCTOPODE:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_SUMMONER:
@@ -329,9 +329,9 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_TROLL:
         case SP_MINOTAUR:
         case SP_GHOUL:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_NECROMANCER:
@@ -344,9 +344,9 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_OGRE:
         case SP_TROLL:
         case SP_MINOTAUR:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_TRANSMUTER:
@@ -354,7 +354,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         {
         case SP_MUMMY:
         case SP_GHOUL:
-            return (CC_BANNED);
+            return CC_BANNED;
         case SP_HIGH_ELF:
         case SP_DEEP_ELF:
         case SP_DEEP_DWARF:
@@ -366,9 +366,9 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_MINOTAUR:
         case SP_TENGU:
         case SP_VAMPIRE:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_FIRE_ELEMENTALIST:
@@ -386,9 +386,9 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_GHOUL:
         case SP_VAMPIRE:
         case SP_FELID:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_ICE_ELEMENTALIST:
@@ -404,9 +404,9 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_MINOTAUR:
         case SP_TENGU:
         case SP_FELID:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_AIR_ELEMENTALIST:
@@ -423,9 +423,9 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_GHOUL:
         case SP_VAMPIRE:
         case SP_FELID:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_EARTH_ELEMENTALIST:
@@ -442,9 +442,9 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_MUMMY:
         case SP_VAMPIRE:
         case SP_FELID:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_VENOM_MAGE:
@@ -461,9 +461,9 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_MUMMY:
         case SP_GHOUL:
         case SP_VAMPIRE:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_STALKER:
@@ -487,16 +487,16 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_GHOUL:
         case SP_FELID:
         case SP_OCTOPODE:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_ASSASSIN:
         switch (speci)
         {
         case SP_FELID:
-            return (CC_BANNED);
+            return CC_BANNED;
         case SP_HIGH_ELF:
         case SP_DEEP_ELF:
         case SP_DEEP_DWARF:
@@ -512,16 +512,16 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_MUMMY:
         case SP_GHOUL:
         case SP_OCTOPODE:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_HUNTER:
         switch (speci)
         {
         case SP_FELID:
-            return (CC_BANNED);
+            return CC_BANNED;
         case SP_DEEP_ELF:
         case SP_HILL_ORC:
         case SP_MERFOLK:
@@ -534,16 +534,16 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_GHOUL:
         case SP_VAMPIRE:
         case SP_OCTOPODE:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_ARTIFICER:
         switch (speci)
         {
         case SP_FELID:
-            return (CC_BANNED);
+            return CC_BANNED;
         case SP_HIGH_ELF:
         case SP_DEEP_ELF:
         case SP_SLUDGE_ELF:
@@ -558,16 +558,16 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_GHOUL:
         case SP_VAMPIRE:
         case SP_OCTOPODE:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_ARCANE_MARKSMAN:
         switch (speci)
         {
         case SP_FELID:
-            return (CC_BANNED);
+            return CC_BANNED;
         case SP_DEEP_DWARF:
         case SP_HILL_ORC:
         case SP_MERFOLK:
@@ -580,16 +580,16 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_MUMMY:
         case SP_GHOUL:
         case SP_OCTOPODE:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         default:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         }
 
     case JOB_WANDERER:
-        return (CC_RESTRICTED);
+        return CC_RESTRICTED;
 
     default:
-        return (CC_BANNED);
+        return CC_BANNED;
     }
 }
 
@@ -616,8 +616,8 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
     {
     case WPN_UNARMED:
         if (species_has_claws(ng.species))
-            return (CC_UNRESTRICTED);
-        return (CC_BANNED);
+            return CC_UNRESTRICTED;
+        return CC_BANNED;
 
     case WPN_SHORT_SWORD:
         switch (ng.species)
@@ -626,7 +626,7 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
         case SP_VAMPIRE:
             // The fighter's heavy armour hinders stabbing.
             if (ng.job == JOB_FIGHTER)
-                return (CC_RESTRICTED);
+                return CC_RESTRICTED;
             // else fall through
         case SP_HIGH_ELF:
         case SP_DEEP_ELF:
@@ -636,18 +636,18 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
         case SP_HALFLING:
         case SP_KOBOLD:
         case SP_SPRIGGAN:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
 
         default:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         }
 
         // Maces and hand axes usually share the same restrictions.
     case WPN_MACE:
         if (ng.species == SP_TROLL || ng.species == SP_OGRE)
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         if (ng.species == SP_VAMPIRE)
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         // else fall-through
     case WPN_HAND_AXE:
         switch (ng.species)
@@ -665,10 +665,10 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
         case SP_VAMPIRE:
         case SP_OCTOPODE:
         case SP_BASE_DRACONIAN:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
 
         default:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         }
 
     case WPN_SPEAR:
@@ -687,7 +687,7 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
         case SP_MUMMY:
         case SP_OCTOPODE:
         case SP_BASE_DRACONIAN:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
 
         case SP_SPRIGGAN:
         case SP_HALFLING:
@@ -696,14 +696,14 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
             // jobs with other benefits like Warper, Skald or godlies
             // are better with two-handers.
             if (ng.job == JOB_FIGHTER || ng.job == JOB_GLADIATOR)
-                return (CC_BANNED);
+                return CC_BANNED;
 
         default:
             return CC_RESTRICTED;
         }
     case WPN_FALCHION:
         if (ng.job != JOB_FIGHTER && ng.job != JOB_GLADIATOR)
-            return (CC_BANNED);
+            return CC_BANNED;
         switch (ng.species)
         {
         case SP_HUMAN:
@@ -722,17 +722,17 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
         case SP_VAMPIRE:
         case SP_OCTOPODE:
         case SP_BASE_DRACONIAN:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
 
         default:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         }
 
     case WPN_TRIDENT:
         if (ng.job != JOB_FIGHTER && ng.job != JOB_GLADIATOR
             || species_size(ng.species, PSIZE_BODY) < SIZE_MEDIUM)
         {
-            return (CC_BANNED);
+            return CC_BANNED;
         }
 
         // Tridents are strictly better than spears, so unrestrict them
@@ -742,7 +742,7 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
         case SP_DEEP_DWARF:
         case SP_GHOUL:
         case SP_VAMPIRE:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
         default:
             break;
         }
@@ -752,7 +752,7 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
 
     case WPN_QUARTERSTAFF:
         if (ng.job != JOB_GLADIATOR)
-            return (CC_BANNED);
+            return CC_BANNED;
         switch (ng.species)
         {
         case SP_CENTAUR:
@@ -768,10 +768,10 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
         case SP_OCTOPODE:
         case SP_SLUDGE_ELF:
         case SP_BASE_DRACONIAN:
-            return (CC_UNRESTRICTED);
+            return CC_UNRESTRICTED;
 
         default:
-            return (CC_RESTRICTED);
+            return CC_RESTRICTED;
         }
 
     case WPN_CROSSBOW:
@@ -863,6 +863,6 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
 
     // intentional fall-through
     default:
-        return (CC_BANNED);
+        return CC_BANNED;
     }
 }