diff options
| author | mmbob <mmbob+github@outlook.com> | 2013-04-30 01:50:12 (GMT) |
|---|---|---|
| committer | mmbob <mmbob+github@outlook.com> | 2013-04-30 01:50:12 (GMT) |
| commit | 9d4cbd3112a6a21858054deebc76b6bf30eec6df (patch) | |
| tree | 40774e20fe7090a085c4f4be9b9f8ec2095ef6ee /src/cat/TPTScriptInterface.cpp | |
| parent | e166640cbbe6d990175e835ae9ff463d9bae34f1 (diff) | |
| parent | b83043e2a6293e83d5d7fbad70a7e20b131ba33b (diff) | |
| download | powder-9d4cbd3112a6a21858054deebc76b6bf30eec6df.zip powder-9d4cbd3112a6a21858054deebc76b6bf30eec6df.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/cat/TPTScriptInterface.cpp')
| -rw-r--r-- | src/cat/TPTScriptInterface.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/cat/TPTScriptInterface.cpp b/src/cat/TPTScriptInterface.cpp index f8c6af6..43bb67b 100644 --- a/src/cat/TPTScriptInterface.cpp +++ b/src/cat/TPTScriptInterface.cpp @@ -261,10 +261,7 @@ AnyType TPTScriptInterface::tptS_set(std::deque<std::string> * words) newValue = GetParticleType(((StringType)value).Value()); if (newValue < 0 || newValue >= PT_NUM) { - if (((StringType)value).Value() == "GOLD" || ((StringType)value).Value() == "gold") - throw GeneralException("No, GOLD will not be an element"); - else - throw GeneralException("Invalid element"); + throw GeneralException("Invalid element"); } } else |