[Refactor] enum classの型名変更 PlayerRaceFood -> PlayerRaceFoodType

#1824にて議論されていたフォーマット統一処理。
PlayerRaceFoodをPlayerRaceFoodTypeに名称変更する。

diff --git a/src/cmd-item/cmd-eat.cpp b/src/cmd-item/cmd-eat.cpp
index 512dd80..63e2148 100644 (file)
--- a/src/cmd-item/cmd-eat.cpp
+++ b/src/cmd-item/cmd-eat.cpp
@@ -155,7 +155,7 @@ bool exe_eat_charge_of_magic_device(player_type *player_ptr, object_type *o_ptr,
     if (o_ptr->tval != ItemKindType::STAFF && o_ptr->tval != ItemKindType::WAND)
         return false;
 
-    if (PlayerRace(player_ptr).food() == PlayerRaceFood::MANA) {
+    if (PlayerRace(player_ptr).food() == PlayerRaceFoodType::MANA) {
         concptr staff;
 
         if (o_ptr->tval == ItemKindType::STAFF && (item < 0) && (o_ptr->number > 1)) {
@@ -277,7 +277,7 @@ void exe_eat_food(player_type *player_ptr, INVENTORY_IDX item)
     auto food_type = PlayerRace(player_ptr).food();
 
     /* Balrogs change humanoid corpses to energy */
-    if (food_type == PlayerRaceFood::CORPSE && (o_ptr->tval == ItemKindType::CORPSE && o_ptr->sval == SV_CORPSE && angband_strchr("pht", r_info[o_ptr->pval].d_char))) {
+    if (food_type == PlayerRaceFoodType::CORPSE && (o_ptr->tval == ItemKindType::CORPSE && o_ptr->sval == SV_CORPSE && angband_strchr("pht", r_info[o_ptr->pval].d_char))) {
         GAME_TEXT o_name[MAX_NLEN];
         describe_flavor(player_ptr, o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
         msg_format(_("%sは燃え上り灰になった。精力を吸収した気がする。", "%^s is burnt to ashes.  You absorb its vitality!"), o_name);
@@ -301,17 +301,17 @@ void exe_eat_food(player_type *player_ptr, INVENTORY_IDX item)
         } else {
             msg_print(_("食べ物がアゴを素通りして落ち、消えた！", "The food falls through your jaws and vanishes!"));
         }
-    } else if (food_type == PlayerRaceFood::BLOOD) {
+    } else if (food_type == PlayerRaceFoodType::BLOOD) {
         /* Vampires are filled only by bloods, so reduced nutritional benefit */
         (void)set_food(player_ptr, player_ptr->food + (o_ptr->pval / 10));
         msg_print(_("あなたのような者にとって食糧など僅かな栄養にしかならない。", "Mere victuals hold scant sustenance for a being such as yourself."));
 
         if (player_ptr->food < PY_FOOD_ALERT) /* Hungry */
             msg_print(_("あなたの飢えは新鮮な血によってのみ満たされる！", "Your hunger can only be satisfied with fresh blood!"));
-    } else if (food_type == PlayerRaceFood::WATER) {
+    } else if (food_type == PlayerRaceFoodType::WATER) {
         msg_print(_("動物の食物はあなたにとってほとんど栄養にならない。", "The food of animals is poor sustenance for you."));
         set_food(player_ptr, player_ptr->food + ((o_ptr->pval) / 20));
-    } else if (food_type != PlayerRaceFood::RATION) {
+    } else if (food_type != PlayerRaceFoodType::RATION) {
         msg_print(_("生者の食物はあなたにとってほとんど栄養にならない。", "The food of mortals is poor sustenance for you."));
         set_food(player_ptr, player_ptr->food + ((o_ptr->pval) / 20));
     } else {

diff --git a/src/cmd-item/cmd-usestaff.cpp b/src/cmd-item/cmd-usestaff.cpp
index 91baa64..fdf66c1 100644 (file)
--- a/src/cmd-item/cmd-usestaff.cpp
+++ b/src/cmd-item/cmd-usestaff.cpp
@@ -272,7 +272,7 @@ int staff_effect(player_type *player_ptr, OBJECT_SUBTYPE_VALUE sval, bool *use_c
 
     case SV_STAFF_NOTHING: {
         msg_print(_("何も起らなかった。", "Nothing happens."));
-        if (PlayerRace(player_ptr).food() == PlayerRaceFood::MANA)
+        if (PlayerRace(player_ptr).food() == PlayerRaceFoodType::MANA)
             msg_print(_("もったいない事をしたような気がする。食べ物は大切にしなくては。", "What a waste.  It's your food!"));
         break;
     }

diff --git a/src/object-hook/hook-expendable.cpp b/src/object-hook/hook-expendable.cpp
index a034eae..6c59a79 100644 (file)
--- a/src/object-hook/hook-expendable.cpp
+++ b/src/object-hook/hook-expendable.cpp
@@ -28,10 +28,10 @@ bool item_tester_hook_eatable(player_type *player_ptr, const object_type *o_ptr)
         return true;
 
     auto food_type = PlayerRace(player_ptr).food();
-    if (food_type == PlayerRaceFood::MANA) {
+    if (food_type == PlayerRaceFoodType::MANA) {
         if (o_ptr->tval == ItemKindType::STAFF || o_ptr->tval == ItemKindType::WAND)
             return true;
-    } else if (food_type == PlayerRaceFood::CORPSE) {
+    } else if (food_type == PlayerRaceFoodType::CORPSE) {
         if (o_ptr->tval == ItemKindType::CORPSE && o_ptr->sval == SV_CORPSE && angband_strchr("pht", r_info[o_ptr->pval].d_char))
             return true;
     }
@@ -50,7 +50,7 @@ bool item_tester_hook_quaff(player_type *player_ptr, const object_type *o_ptr)
     if (o_ptr->tval == ItemKindType::POTION)
         return true;
 
-    if (PlayerRace(player_ptr).food() == PlayerRaceFood::OIL && o_ptr->tval == ItemKindType::FLASK && o_ptr->sval == SV_FLASK_OIL)
+    if (PlayerRace(player_ptr).food() == PlayerRaceFoodType::OIL && o_ptr->tval == ItemKindType::FLASK && o_ptr->sval == SV_FLASK_OIL)
         return true;
 
     return false;

diff --git a/src/object-use/quaff-execution.cpp b/src/object-use/quaff-execution.cpp
index 4965ccf..40b78d3 100644 (file)
--- a/src/object-use/quaff-execution.cpp
+++ b/src/object-use/quaff-execution.cpp
@@ -118,9 +118,9 @@ void ObjectQuaffEntity::execute(INVENTORY_IDX item)
         case SV_POTION_SALT_WATER: {
             msg_print(_("うぇ！思わず吐いてしまった。", "The potion makes you vomit!"));
             switch (PlayerRace(this->player_ptr).food()) {
-            case PlayerRaceFood::RATION:
-            case PlayerRaceFood::WATER:
-            case PlayerRaceFood::BLOOD:
+            case PlayerRaceFoodType::RATION:
+            case PlayerRaceFoodType::WATER:
+            case PlayerRaceFoodType::BLOOD:
                 (void)set_food(this->player_ptr, PY_FOOD_STARVE - 1);
                 break;
             default:
@@ -538,11 +538,11 @@ void ObjectQuaffEntity::execute(INVENTORY_IDX item)
         return; //!< @note スケルトンは水分で飢えを満たせない
 
     switch (PlayerRace(this->player_ptr).food()) {
-    case PlayerRaceFood::WATER:
+    case PlayerRaceFoodType::WATER:
         msg_print(_("水分を取り込んだ。", "You are moistened."));
         set_food(this->player_ptr, std::min<short>(this->player_ptr->food + q_ptr->pval + std::max<short>(0, q_ptr->pval * 10) + 2000, PY_FOOD_MAX - 1));
         break;
-    case PlayerRaceFood::OIL:
+    case PlayerRaceFoodType::OIL:
         if (q_ptr->tval == ItemKindType::FLASK) {
             msg_print(_("オイルを補給した。", "You replenish yourself with the oil."));
             set_food(this->player_ptr, this->player_ptr->food + 5000);
@@ -550,11 +550,11 @@ void ObjectQuaffEntity::execute(INVENTORY_IDX item)
             set_food(this->player_ptr, this->player_ptr->food + ((q_ptr->pval) / 20));
         }
         break;
-    case PlayerRaceFood::BLOOD:
+    case PlayerRaceFoodType::BLOOD:
         (void)set_food(this->player_ptr, this->player_ptr->food + (q_ptr->pval / 10));
         break;
-    case PlayerRaceFood::MANA:
-    case PlayerRaceFood::CORPSE:
+    case PlayerRaceFoodType::MANA:
+    case PlayerRaceFoodType::CORPSE:
         set_food(this->player_ptr, this->player_ptr->food + ((q_ptr->pval) / 20));
         break;
     default:

diff --git a/src/player-base/player-race.cpp b/src/player-base/player-race.cpp
index c86240a..ea316bb 100644 (file)
--- a/src/player-base/player-race.cpp
+++ b/src/player-base/player-race.cpp
@@ -91,7 +91,7 @@ PlayerRaceLifeType PlayerRace::life() const
  * @param base_race ミミック中も元種族の情報を返すならtrue
  * @return 食料形態
  */
-PlayerRaceFood PlayerRace::food() const
+PlayerRaceFoodType PlayerRace::food() const
 {
     return this->get_info()->food;
 }

diff --git a/src/player-base/player-race.h b/src/player-base/player-race.h
index 35aa9cf..282d21c 100644 (file)
--- a/src/player-base/player-race.h
+++ b/src/player-base/player-race.h
@@ -4,7 +4,7 @@
 
 enum class PlayerRaceType;
 enum class PlayerRaceLifeType;
-enum class PlayerRaceFood;
+enum class PlayerRaceFoodType;
 struct player_type;
 struct player_race_info;
 class PlayerRace {
@@ -15,7 +15,7 @@ public:
     TrFlags tr_flags() const;
     const player_race_info *get_info() const;
     PlayerRaceLifeType life() const;
-    PlayerRaceFood food() const;
+    PlayerRaceFoodType food() const;
 
     bool is_mimic_nonliving() const;
     bool has_cut_immunity() const;

diff --git a/src/player-info/mimic-info-table.cpp b/src/player-info/mimic-info-table.cpp
index 77b2091..14f81d9 100644 (file)
--- a/src/player-info/mimic-info-table.cpp
+++ b/src/player-info/mimic-info-table.cpp
@@ -23,7 +23,7 @@ const player_race_info mimic_info[MAX_MIMIC_FORMS] =
                0,
                0x000000,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
                { },
        },
        {
@@ -37,7 +37,7 @@ const player_race_info mimic_info[MAX_MIMIC_FORMS] =
                5,
                0x000003,
                PlayerRaceLifeType::DEMON,
-               PlayerRaceFood::CORPSE,
+               PlayerRaceFoodType::CORPSE,
                {
                        { TR_RES_FIRE },
                        { TR_RES_NETHER },
@@ -58,7 +58,7 @@ const player_race_info mimic_info[MAX_MIMIC_FORMS] =
                20,
                0x000003,
                PlayerRaceLifeType::DEMON,
-               PlayerRaceFood::CORPSE,
+               PlayerRaceFoodType::CORPSE,
                {
                        { TR_IM_FIRE },
                        { TR_RES_COLD },
@@ -90,7 +90,7 @@ const player_race_info mimic_info[MAX_MIMIC_FORMS] =
                5,
                0x000005,
                PlayerRaceLifeType::UNDEAD,
-               PlayerRaceFood::BLOOD,
+               PlayerRaceFoodType::BLOOD,
                {
                        { TR_RES_COLD },
                        { TR_RES_POIS },

diff --git a/src/player-info/race-info.h b/src/player-info/race-info.h
index 30ab30c..786c5bb 100644 (file)
--- a/src/player-info/race-info.h
+++ b/src/player-info/race-info.h
@@ -36,7 +36,7 @@ enum class PlayerRaceLifeType {
 /*!
  * @brief プレイヤー種族の食料形態
  */
-enum class PlayerRaceFood {
+enum class PlayerRaceFoodType {
     RATION = 0, //!< 食料
     WATER = 1, //!< 水
     OIL = 2, //!< 油
@@ -104,7 +104,7 @@ struct player_race_info {
 
     uint32_t choice{}; //!< 似つかわしい職業(ミミック時はミミック種族属性) / Legal class choices
     PlayerRaceLifeType life{}; //!< 生命の形態
-    PlayerRaceFood food{}; //!< 食料の形態
+    PlayerRaceFoodType food{}; //!< 食料の形態
 
     std::vector<player_race_condition> extra_flags;
 };

diff --git a/src/player/race-info-table.cpp b/src/player/race-info-table.cpp
index 6fb4bfd..2d6a8c7 100644 (file)
--- a/src/player/race-info-table.cpp
+++ b/src/player/race-info-table.cpp
@@ -35,7 +35,7 @@ const player_race_info race_info[MAX_RACES] =
                0,
                0x1FFFFFFF,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
                {},
        },
        {
@@ -49,7 +49,7 @@ const player_race_info race_info[MAX_RACES] =
                2,
                0x1E77E7FF,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {},
     },
        {
@@ -63,7 +63,7 @@ const player_race_info race_info[MAX_RACES] =
                3,
                0x1E77E75B,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_RES_LITE },
                },
@@ -79,7 +79,7 @@ const player_race_info race_info[MAX_RACES] =
                4,
                0x1F6FFC0B,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_HOLD_EXP },
                },
@@ -95,7 +95,7 @@ const player_race_info race_info[MAX_RACES] =
                4,
                0x1F67D60F,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_FREE_ACT },
                },
@@ -111,7 +111,7 @@ const player_race_info race_info[MAX_RACES] =
                5,
                0x11890005,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_RES_BLIND },
                },
@@ -127,7 +127,7 @@ const player_race_info race_info[MAX_RACES] =
                3,
                0x1DD8818D,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_RES_DARK },
                },
@@ -143,7 +143,7 @@ const player_race_info race_info[MAX_RACES] =
                3,
                0x00880005,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_SUST_STR },
                        { TR_REGEN, 15 },
@@ -163,7 +163,7 @@ const player_race_info race_info[MAX_RACES] =
                0,
                0x1FFFF7FF,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_SUST_CON },
                        { TR_REGEN },
@@ -180,7 +180,7 @@ const player_race_info race_info[MAX_RACES] =
                4,
                0x1F77E75B,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_RES_LITE },
                        { TR_SEE_INVIS },
@@ -197,7 +197,7 @@ const player_race_info race_info[MAX_RACES] =
                0,
                0x05C0A09D,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_RES_FEAR },
                },
@@ -213,7 +213,7 @@ const player_race_info race_info[MAX_RACES] =
                3,
                0x10A80407,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_SUST_STR },
                        { TR_RES_DARK },
@@ -230,7 +230,7 @@ const player_race_info race_info[MAX_RACES] =
                3,
                0x08880011,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_SUST_STR },
                        { TR_RES_SHARDS },
@@ -247,7 +247,7 @@ const player_race_info race_info[MAX_RACES] =
                0,
                0x123D4727,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_RES_CHAOS },
                },
@@ -263,7 +263,7 @@ const player_race_info race_info[MAX_RACES] =
                1,
                0x00888005,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_RES_SOUND },
                },
@@ -279,7 +279,7 @@ const player_race_info race_info[MAX_RACES] =
                2,
                0x1667360F,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_RES_ACID },
                        { TR_IM_ACID, 20 },
@@ -296,7 +296,7 @@ const player_race_info race_info[MAX_RACES] =
                2,
                0x004D8011,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_RES_ACID },
                        { TR_RES_CONF },
@@ -314,7 +314,7 @@ const player_race_info race_info[MAX_RACES] =
                3,
                0x1444A009,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_RES_POIS },
                },
@@ -330,7 +330,7 @@ const player_race_info race_info[MAX_RACES] =
                5,
                0x1569040F,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_RES_DARK },
                        { TR_RES_DISEN },
@@ -347,7 +347,7 @@ const player_race_info race_info[MAX_RACES] =
                5,
                0x1E77C7DF,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_RES_DARK },
                        { TR_SEE_INVIS, 20 },
@@ -364,7 +364,7 @@ const player_race_info race_info[MAX_RACES] =
                2,
                0x07FFE757,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_RES_FIRE, 5 },
                        { TR_RES_COLD, 10 },
@@ -385,7 +385,7 @@ const player_race_info race_info[MAX_RACES] =
                4,
                0x12334746,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_SUST_INT },
                        { TR_SUST_WIS },
@@ -404,7 +404,7 @@ const player_race_info race_info[MAX_RACES] =
                3,
                0x1DB537CB,
                PlayerRaceLifeType::DEMON,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_RES_FIRE },
                        { TR_SEE_INVIS, 10 },
@@ -421,7 +421,7 @@ const player_race_info race_info[MAX_RACES] =
                4,
                0x00800001,
                PlayerRaceLifeType::NONLIVING,
-               PlayerRaceFood::MANA,
+               PlayerRaceFoodType::MANA,
         {
                        { TR_RES_POIS },
                        { TR_SEE_INVIS },
@@ -441,7 +441,7 @@ const player_race_info race_info[MAX_RACES] =
                2,
                0x0234070F,
                PlayerRaceLifeType::UNDEAD,
-               PlayerRaceFood::MANA,
+               PlayerRaceFoodType::MANA,
                {
                        { TR_RES_COLD, 10 },
                        { TR_RES_POIS },
@@ -461,7 +461,7 @@ const player_race_info race_info[MAX_RACES] =
                2,
                0x00800001,
                PlayerRaceLifeType::UNDEAD,
-               PlayerRaceFood::MANA,
+               PlayerRaceFoodType::MANA,
                {
                        { TR_RES_COLD, 5 },
                        { TR_RES_POIS },
@@ -482,7 +482,7 @@ const player_race_info race_info[MAX_RACES] =
                5,
                0x067DC7FF,
                PlayerRaceLifeType::UNDEAD,
-               PlayerRaceFood::BLOOD,
+               PlayerRaceFoodType::BLOOD,
                {
                        { TR_RES_COLD },
                        { TR_RES_POIS },
@@ -504,7 +504,7 @@ const player_race_info race_info[MAX_RACES] =
                5,
                0x0631474A,
                PlayerRaceLifeType::UNDEAD,
-               PlayerRaceFood::MANA,
+               PlayerRaceFoodType::MANA,
                {
                        { TR_RES_COLD },
                        { TR_RES_POIS },
@@ -528,7 +528,7 @@ const player_race_info race_info[MAX_RACES] =
                4,
                0x1623F65E,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_RES_LITE },
                        { TR_LEVITATION },
@@ -546,7 +546,7 @@ const player_race_info race_info[MAX_RACES] =
                0,
                0x057887CF,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_RES_CONF },
                        { TR_RES_SOUND },
@@ -563,7 +563,7 @@ const player_race_info race_info[MAX_RACES] =
                  0,
                0x10010005,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::WATER,
+               PlayerRaceFoodType::WATER,
         {
                        { TR_VUL_FIRE }
                },
@@ -579,7 +579,7 @@ const player_race_info race_info[MAX_RACES] =
                3,
                0x1779F777,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_SEE_INVIS },
                        { TR_LEVITATION },
@@ -596,7 +596,7 @@ const player_race_info race_info[MAX_RACES] =
                5,
                0x07EDC4DB,
                PlayerRaceLifeType::DEMON,
-               PlayerRaceFood::CORPSE,
+               PlayerRaceFoodType::CORPSE,
         {
                        { TR_RES_FIRE },
                        { TR_RES_NETHER },
@@ -615,7 +615,7 @@ const player_race_info race_info[MAX_RACES] =
                0,
                0x1FFFF7FF,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_SUST_CON },
                },
@@ -631,7 +631,7 @@ const player_race_info race_info[MAX_RACES] =
                  4,
                0x1E33C7DF,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_VUL_LITE },
                        { TR_LEVITATION },
@@ -648,7 +648,7 @@ const player_race_info race_info[MAX_RACES] =
                0,
                0x0C18B7AD,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_RES_CONF },
                },
@@ -664,7 +664,7 @@ const player_race_info race_info[MAX_RACES] =
                0,
                0x00800001,
                PlayerRaceLifeType::NONLIVING,
-               PlayerRaceFood::OIL,
+               PlayerRaceFoodType::OIL,
         {
                        { TR_VUL_ELEC },
                        { TR_RES_POIS },
@@ -684,7 +684,7 @@ const player_race_info race_info[MAX_RACES] =
                2,
                0x1E77E7FF,
                PlayerRaceLifeType::LIVING,
-               PlayerRaceFood::RATION,
+               PlayerRaceFoodType::RATION,
         {
                        { TR_RES_WATER },
                },