diff options
| author | Neil Moore <neil@s-z.org> | 2011-12-27 20:19:45 -0500 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2011-12-27 20:19:45 -0500 |
| commit | c0bbaee3e9372376e7a628e18481e4c6b916bbb0 (patch) | |
| tree | 7a04e40924368a1e0ce63918a08c27a1d6c56180 /crawl-ref/source/mgen_data.h | |
| parent | efb6b1fd7b0c5027acd6d6ecede9bb34dfbea356 (diff) | |
| download | crawl-ref-c0bbaee3e9372376e7a628e18481e4c6b916bbb0.tar.gz crawl-ref-c0bbaee3e9372376e7a628e18481e4c6b916bbb0.zip | |
Eliminate duplicated symbols.
Objects, even const ones, should not be defined in header files, or
there will be one copy for each source file that included that header.
Move the offending definitions into source files, and replace them
with extern declarations in the headers.
Also, make the opc_* instances const and not static.
Diffstat (limited to 'crawl-ref/source/mgen_data.h')
| -rw-r--r-- | crawl-ref/source/mgen_data.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/mgen_data.h b/crawl-ref/source/mgen_data.h index 6e82b63071..f101c37589 100644 --- a/crawl-ref/source/mgen_data.h +++ b/crawl-ref/source/mgen_data.h @@ -6,7 +6,7 @@ // Hash key for passing a weapon to be given to // a dancing weapon. -const std::string TUKIMA_WEAPON = "tukima-weapon"; +extern const std::string TUKIMA_WEAPON; // A structure with all the data needed to whip up a new monster. struct mgen_data |