summaryrefslogtreecommitdiffstats
path: root/pokemod/Pokemod.cpp
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2008-04-19 23:38:51 +0000
committerBen Boeckel <MathStuf@gmail.com>2008-04-19 23:38:51 +0000
commitf4f3176a6dcdaf5e463f39a657dd4ca04386a6ad (patch)
tree9807262b48268eecf6ae7967aa64f30666091f2a /pokemod/Pokemod.cpp
parentfe31331e2807634ae659e372358bac5781de9130 (diff)
downloadsigen-f4f3176a6dcdaf5e463f39a657dd4ca04386a6ad.tar.gz
sigen-f4f3176a6dcdaf5e463f39a657dd4ca04386a6ad.tar.xz
sigen-f4f3176a6dcdaf5e463f39a657dd4ca04386a6ad.zip
[FIX] Loading of submodules
[FIX] Loading the id now defaults to INT_MAX git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@101 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemod/Pokemod.cpp')
-rw-r--r--pokemod/Pokemod.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/pokemod/Pokemod.cpp b/pokemod/Pokemod.cpp
index bed4f017..8756ebde 100644
--- a/pokemod/Pokemod.cpp
+++ b/pokemod/Pokemod.cpp
@@ -66,7 +66,7 @@ Pokemod::Pokemod() :
m_surfSkin(192, 128),
m_flySkin(192, 128),
m_fishSkin(192, 128),
- m_surfFishSkin(),
+ m_surfFishSkin(192, 128),
m_superPCUname(""),
m_superPCPasswd(""),
m_typeChart(0, 0),//, Fraction(1, 1, Fraction::Improper)),
@@ -393,23 +393,23 @@ void Pokemod::load(const QDomElement& xml, const int) throw(Exception)
LOAD(QString, superPCUname);
LOAD(QString, superPCPasswd);
LOAD(Rules, rules);
- LOAD_SUB(newAbility, abilities);
- LOAD_SUB(newAuthor, authors);
- LOAD_SUB(newBadge, badges);
- LOAD_SUB(newCoinList, coinLists);
- LOAD_SUB(newDialog, dialogs);
- LOAD_SUB(newEggGroup, eggGroups);
- LOAD_SUB(newItem, items);
- LOAD_SUB(newItemType, itemTypes);
- LOAD_SUB(newMap, maps);
- LOAD_SUB(newMove, moves);
- LOAD_SUB(newNature, natures);
- LOAD_SUB(newSpecies, species);
- LOAD_SUB(newStore, stores);
- LOAD_SUB(newTile, tiles);
- LOAD_SUB(newTime, times);
- LOAD_SUB(newTrainer, trainers);
- LOAD_SUB(newType, types);
+ LOAD_SUB(newAbility, Ability);
+ LOAD_SUB(newAuthor, Author);
+ LOAD_SUB(newBadge, Badge);
+ LOAD_SUB(newCoinList, CoinList);
+ LOAD_SUB(newDialog, Dialog);
+ LOAD_SUB(newEggGroup, EggGroup);
+ LOAD_SUB(newItem, Item);
+ LOAD_SUB(newItemType, ItemType);
+ LOAD_SUB(newMap, Map);
+ LOAD_SUB(newMove, Move);
+ LOAD_SUB(newNature, Nature);
+ LOAD_SUB(newSpecies, Species);
+ LOAD_SUB(newStore, Store);
+ LOAD_SUB(newTile, Tile);
+ LOAD_SUB(newTime, Time);
+ LOAD_SUB(newTrainer, Trainer);
+ LOAD_SUB(newType, Type);
LOAD_MATRIX(setTypeChart, Fraction, typeChart);
}