diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2016-09-17 09:58:13 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2016-09-17 09:58:13 +0200 |
| commit | 4d07dca15f547f6233b714c8c82b43bcd5beaebc (patch) | |
| tree | a6b353f214e8e69197d71ed9d78da209c306efea /src/player_race.hpp | |
| parent | 804ff8c184e8ce892ed7629ba6feec9bef5aa7ff (diff) | |
Unify obj_* fields into object_proto struct
Diffstat (limited to 'src/player_race.hpp')
| -rw-r--r-- | src/player_race.hpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/player_race.hpp b/src/player_race.hpp index 6e2b861d..740c6a5a 100644 --- a/src/player_race.hpp +++ b/src/player_race.hpp @@ -3,6 +3,7 @@ #include "h-basic.h" #include "body.hpp" #include "object_flag_set.hpp" +#include "object_proto.hpp" #include "player_defs.hpp" #include "player_race_ability_type.hpp" #include "player_race_flag_set.hpp" @@ -43,11 +44,7 @@ struct player_race struct skill_modifiers skill_modifiers; - s16b obj_tval[5] { }; - s16b obj_sval[5] { }; - s16b obj_pval[5] { }; - s16b obj_dd[5] { }; - s16b obj_ds[5] { }; + std::array<object_proto, 5> obj; s16b obj_num = 0; std::array<player_race_ability_type, 10> abilities; /* Abilitiers to be gained by level(doesnt take prereqs in account) */ |