capitalized all enums
This commit is contained in:
@ -31,17 +31,17 @@ std::unique_ptr<enemy_base> new_dragon(RNG *rng, const position &pos,
|
||||
|
||||
const int EXCNT = 12;
|
||||
const race EXCHOICES[EXCNT] = {
|
||||
rhuman, rdwarf, rhalfling, relf, rorc, rmerchant,
|
||||
rviking, rswordsman, rleprechaun, rwitch, rhacker, rbaby_dragon
|
||||
HUMAN, DWARF, HALFLING, ELF, ORC, MERCHANT,
|
||||
VIKING, SWORDSMAN, LEPRECHAUN, WITCH, HACKER, BABY_DRAGON
|
||||
};
|
||||
const int CNT = 18;
|
||||
const race CHOICES[CNT] = {
|
||||
rhuman, rhuman, rhuman, rhuman,
|
||||
rdwarf, rdwarf, rdwarf,
|
||||
rhalfling, rhalfling, rhalfling, rhalfling, rhalfling,
|
||||
relf, relf,
|
||||
rorc, rorc,
|
||||
rmerchant, rmerchant
|
||||
HUMAN, HUMAN, HUMAN, HUMAN,
|
||||
DWARF, DWARF, DWARF,
|
||||
HALFLING, HALFLING, HALFLING, HALFLING, HALFLING,
|
||||
ELF, ELF,
|
||||
ORC, ORC,
|
||||
MERCHANT, MERCHANT
|
||||
};
|
||||
|
||||
enum race get_extra_race(RNG *rng) {
|
||||
@ -65,51 +65,51 @@ std::unique_ptr<enemy_base> new_enemy(RNG *rng, const position &pos,
|
||||
r = get_normal_race(rng);
|
||||
|
||||
switch (r) {
|
||||
case rdwarf:
|
||||
case DWARF:
|
||||
return make_unique<dwarf>(rng, enabled_features,
|
||||
pos, which_room);
|
||||
|
||||
case rhuman:
|
||||
case HUMAN:
|
||||
return make_unique<human>(rng, enabled_features,
|
||||
pos, which_room);
|
||||
|
||||
case relf:
|
||||
case ELF:
|
||||
return make_unique<elf>(rng, enabled_features,
|
||||
pos, which_room);
|
||||
|
||||
case rorc:
|
||||
case ORC:
|
||||
return make_unique<orc>(rng, enabled_features,
|
||||
pos, which_room);
|
||||
|
||||
case rmerchant:
|
||||
case MERCHANT:
|
||||
return make_unique<merchant>(rng, enabled_features,
|
||||
pos, which_room);
|
||||
|
||||
case rhalfling:
|
||||
case HALFLING:
|
||||
return make_unique<halfling>(rng, enabled_features,
|
||||
pos, which_room);
|
||||
|
||||
case rviking:
|
||||
case VIKING:
|
||||
return make_unique<viking>(rng, enabled_features,
|
||||
pos, which_room);
|
||||
|
||||
case rswordsman:
|
||||
case SWORDSMAN:
|
||||
return make_unique<swordsman>(rng, enabled_features,
|
||||
pos, which_room);
|
||||
|
||||
case rleprechaun:
|
||||
case LEPRECHAUN:
|
||||
return make_unique<leprechaun>(rng, enabled_features,
|
||||
pos, which_room);
|
||||
|
||||
case rwitch:
|
||||
case WITCH:
|
||||
return make_unique<witch>(rng, enabled_features,
|
||||
pos, which_room);
|
||||
|
||||
case rhacker:
|
||||
case HACKER:
|
||||
return make_unique<hacker>(rng, enabled_features,
|
||||
pos, which_room);
|
||||
|
||||
case rbaby_dragon:
|
||||
case BABY_DRAGON:
|
||||
return make_unique<baby_dragon>(rng, enabled_features,
|
||||
pos, which_room);
|
||||
|
||||
|
Reference in New Issue
Block a user