diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-12-29 12:09:27 -0500 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-12-29 12:09:27 -0500 |
| commit | 8e278873d4bd35a7cd7f3b6d9d7852fa422370b8 (patch) | |
| tree | 9e97b71d30779c07c79ca166e1d704a3de4d5e4f /sigscript/SpeciesItemWrapper.cpp | |
| parent | e801b73a2f9cb845913cf546002c8f50eefc473c (diff) | |
| download | sigen-8e278873d4bd35a7cd7f3b6d9d7852fa422370b8.tar.gz sigen-8e278873d4bd35a7cd7f3b6d9d7852fa422370b8.tar.xz sigen-8e278873d4bd35a7cd7f3b6d9d7852fa422370b8.zip | |
Merged CHECK macro branch
Diffstat (limited to 'sigscript/SpeciesItemWrapper.cpp')
| -rw-r--r-- | sigscript/SpeciesItemWrapper.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sigscript/SpeciesItemWrapper.cpp b/sigscript/SpeciesItemWrapper.cpp index a41f8dc5..a734c978 100644 --- a/sigscript/SpeciesItemWrapper.cpp +++ b/sigscript/SpeciesItemWrapper.cpp @@ -43,7 +43,6 @@ Sigscript::ItemWrapper* Sigscript::SpeciesItemWrapper::item() int Sigscript::SpeciesItemWrapper::weight() const { - if (sigmod()->singlePlayer() && hasValueOfType<int>("weight")) - return valueOfType<int>("weight"); + ALLOW_OVERRIDE_SO(item, int, weight); return m_item->weight(); } |