summaryrefslogtreecommitdiffstats
path: root/pokemod/Store.cpp
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2008-08-04 03:27:13 +0000
committerBen Boeckel <MathStuf@gmail.com>2008-08-04 03:27:13 +0000
commit373e686bf4ecaaabcf80544e74f017eebe05213f (patch)
treecddf7a223f16944b0380386e568f2606f634c366 /pokemod/Store.cpp
parent63417b1c5057d22bd853e92cd3a25aa812b8d917 (diff)
downloadsigen-373e686bf4ecaaabcf80544e74f017eebe05213f.tar.gz
sigen-373e686bf4ecaaabcf80544e74f017eebe05213f.tar.xz
sigen-373e686bf4ecaaabcf80544e74f017eebe05213f.zip
[FIX] Cleaned up the RC file
[FIX] Script editing is getting there (still a little weird...) [FIX] Cleaned up the main file a bit [FIX] Added the Skin class [FIX] All sprites and skins are internally linked now [FIX] No more image restraints (tiles are still enforced so that map editing works) [FIX] Cleaned up checking for valid values when setting in pokemod [FIX] Removed FileDialog files git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@233 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemod/Store.cpp')
-rw-r--r--pokemod/Store.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/pokemod/Store.cpp b/pokemod/Store.cpp
index 3acffcac..0a873125 100644
--- a/pokemod/Store.cpp
+++ b/pokemod/Store.cpp
@@ -53,9 +53,7 @@ void Pokemod::Store::validate()
if (m_name.isEmpty())
emit(error("Name is empty"));
if (m_item.size())
- {
TEST_LIST(setItem, item);
- }
else
emit(error("No items in the store"));
TEST_END();
@@ -82,11 +80,8 @@ void Pokemod::Store::setName(const QString& name)
void Pokemod::Store::setItem(const int item, const bool state)
{
if (qobject_cast<const Pokemod*>(pokemod())->itemIndex(item) == INT_MAX)
- {
emit(error(bounds("item")));
- return;
- }
- if (state && !m_item.contains(item))
+ else if (state && !m_item.contains(item))
{
m_item.append(item);
emit(changed());