summaryrefslogtreecommitdiffstats
path: root/sigscript/MapEffectWrapper.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/MapEffectWrapper.cpp
parente801b73a2f9cb845913cf546002c8f50eefc473c (diff)
downloadsigen-8e278873d4bd35a7cd7f3b6d9d7852fa422370b8.tar.gz
sigen-8e278873d4bd35a7cd7f3b6d9d7852fa422370b8.tar.xz
sigen-8e278873d4bd35a7cd7f3b6d9d7852fa422370b8.zip
Merged CHECK macro branch
Diffstat (limited to 'sigscript/MapEffectWrapper.cpp')
-rw-r--r--sigscript/MapEffectWrapper.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/sigscript/MapEffectWrapper.cpp b/sigscript/MapEffectWrapper.cpp
index 0302c89d..d51cdca0 100644
--- a/sigscript/MapEffectWrapper.cpp
+++ b/sigscript/MapEffectWrapper.cpp
@@ -43,8 +43,7 @@ QString Sigscript::MapEffectWrapper::name() const
QPoint Sigscript::MapEffectWrapper::coordinate() const
{
- if (sigmod()->singlePlayer() && hasValueOfType<QPoint>("coordinate"))
- return valueOfType<QPoint>("coordinate");
+ ALLOW_OVERRIDE_SO(effect, QPoint, coordinate);
return m_effect->coordinate();
}
@@ -55,8 +54,7 @@ Sigscript::SkinWrapper* Sigscript::MapEffectWrapper::skin()
bool Sigscript::MapEffectWrapper::isGhost() const
{
- if (sigmod()->singlePlayer() && hasValueOfType<bool>("ghost"))
- return valueOfType<bool>("ghost");
+ ALLOW_OVERRIDE_SO(effect, bool, isGhost);
return m_effect->isGhost();
}