summaryrefslogtreecommitdiffstats
path: root/sigscript/ItemWrapper.cpp
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2008-12-29 12:09:27 -0500
committerBen Boeckel <MathStuf@gmail.com>2008-12-29 12:09:27 -0500
commit8e278873d4bd35a7cd7f3b6d9d7852fa422370b8 (patch)
tree9e97b71d30779c07c79ca166e1d704a3de4d5e4f /sigscript/ItemWrapper.cpp
parente801b73a2f9cb845913cf546002c8f50eefc473c (diff)
downloadsigen-8e278873d4bd35a7cd7f3b6d9d7852fa422370b8.tar.gz
sigen-8e278873d4bd35a7cd7f3b6d9d7852fa422370b8.tar.xz
sigen-8e278873d4bd35a7cd7f3b6d9d7852fa422370b8.zip
Merged CHECK macro branch
Diffstat (limited to 'sigscript/ItemWrapper.cpp')
-rw-r--r--sigscript/ItemWrapper.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/sigscript/ItemWrapper.cpp b/sigscript/ItemWrapper.cpp
index 1e341144..22706474 100644
--- a/sigscript/ItemWrapper.cpp
+++ b/sigscript/ItemWrapper.cpp
@@ -52,15 +52,13 @@ Sigscript::ItemTypeWrapper* Sigscript::ItemWrapper::type()
int Sigscript::ItemWrapper::price() const
{
- if (sigmod()->singlePlayer() && hasValueOfType<int>("price"))
- return valueOfType<int>("price");
+ ALLOW_OVERRIDE_SO(item, int, price);
return m_item->price();
}
int Sigscript::ItemWrapper::sellPrice() const
{
- if (sigmod()->singlePlayer() && hasValueOfType<int>("sellPrice"))
- return valueOfType<int>("sellPrice");
+ ALLOW_OVERRIDE_SO(item, int, sellPrice);
return m_item->sellPrice();
}