From 8e278873d4bd35a7cd7f3b6d9d7852fa422370b8 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 29 Dec 2008 12:09:27 -0500 Subject: Merged CHECK macro branch --- sigscript/SpeciesItemWrapper.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sigscript/SpeciesItemWrapper.cpp') 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("weight")) - return valueOfType("weight"); + ALLOW_OVERRIDE_SO(item, int, weight); return m_item->weight(); } -- cgit