diff options
author | Bardur Arantsson <bardur@scientician.net> | 2016-10-05 18:45:09 +0200 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2016-10-05 18:49:38 +0200 |
commit | cbafbc638c2e1d5bb40ee6bc419007062e9615e4 (patch) | |
tree | 0a4644c9c935a2a54d8b52613c67a09fc2fbf4be /src/init2.cc | |
parent | 551339813797a9b274ccf5f3f0c4f0d0b44cbf64 (diff) |
Remove traps
Credit goes mostly to "miramor" <danlev@norwoodlight.com> who did most
of the actual work. I just did a few minor tweaks and fixes + rebased
onto master.
Diffstat (limited to 'src/init2.cc')
-rw-r--r-- | src/init2.cc | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/init2.cc b/src/init2.cc index bb909328..1b83851e 100644 --- a/src/init2.cc +++ b/src/init2.cc @@ -45,7 +45,6 @@ #include "store_info_type.hpp" #include "store_type.hpp" #include "tables.hpp" -#include "trap_type.hpp" #include "tome/make_array.hpp" #include "town_type.hpp" #include "util.hpp" @@ -436,17 +435,6 @@ namespace { }; - struct tr_info_traits { - - static constexpr char const *name = "tr_info.txt"; - - static errr parse(FILE *fp) - { - return init_t_info_txt(fp); - } - - }; - struct v_info_traits { static constexpr char const *name = "v_info.txt"; @@ -1254,10 +1242,6 @@ void init_angband(void) note("[Initialising arrays... (towns)]"); if (init_towns()) quit("Cannot initialise towns"); - /* Initialise trap info */ - note("[Initialising arrays... (traps)]"); - if (init_x_info<tr_info_traits>()) quit("Cannot initialise traps"); - /* Initialise some other arrays */ note("[Initialising arrays... (other)]"); if (init_other()) quit("Cannot initialise other stuff"); |