summaryrefslogtreecommitdiffstats
path: root/pokemod
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2008-01-24 18:08:46 +0000
committerBen Boeckel <MathStuf@gmail.com>2008-01-24 18:08:46 +0000
commit357811219a245f0c9fccffe9ca1a50adfa403e62 (patch)
treec2cc8178a05f85382fb8cb5ac1716367fe6fc233 /pokemod
parent81fc446d3666aabfcf99109c4e8bfe775c93a3d6 (diff)
downloadsigen-357811219a245f0c9fccffe9ca1a50adfa403e62.tar.gz
sigen-357811219a245f0c9fccffe9ca1a50adfa403e62.tar.xz
sigen-357811219a245f0c9fccffe9ca1a50adfa403e62.zip
[FIX] BugCatcher now asks if the user wants to open KBugReport
[FIX] Exception members are now const [FIX] map was uninitialized in Dialog validation [FIX] (un)setting Breeding in Rules [FIX] GUI now works (though with QMainWindow and QTabWidget in Rules) git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@42 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemod')
-rw-r--r--pokemod/Dialog.cpp2
-rw-r--r--pokemod/Rules.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/pokemod/Dialog.cpp b/pokemod/Dialog.cpp
index a907fb2b..b1c164f3 100644
--- a/pokemod/Dialog.cpp
+++ b/pokemod/Dialog.cpp
@@ -120,7 +120,7 @@ bool Dialog::validate() const
unsigned tempU = arg.toUInt(&okU);
unsigned long tempUL = arg.toULong(&okUL);
unsigned invError = 0;
- const Map* map;
+ const Map* map = NULL;
++numArgs;
switch (curCmd)
{
diff --git a/pokemod/Rules.cpp b/pokemod/Rules.cpp
index 48f885b5..7f031eb6 100644
--- a/pokemod/Rules.cpp
+++ b/pokemod/Rules.cpp
@@ -188,7 +188,7 @@ void Rules::setGenderAllowed(const bool g)
void Rules::setBreedingAllowed(const bool b) throw(Exception)
{
- if (!genderAllowed)
+ if (b && !genderAllowed)
throw(Exception(className, "cannot breed without genders"));
breedingAllowed = b;
}