diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-08-05 17:44:25 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-08-05 17:44:25 +0000 |
| commit | fa4764c9e4d86fdfa976bb9fa9f6976e82c496d5 (patch) | |
| tree | 3137a434b832ddf321723297f5b4b1ed75bc4fc0 /pokebattle/Arena.cpp | |
| parent | cf49a16b29ac412cfea125f7216a0e51e79aa4de (diff) | |
| download | sigen-fa4764c9e4d86fdfa976bb9fa9f6976e82c496d5.tar.gz sigen-fa4764c9e4d86fdfa976bb9fa9f6976e82c496d5.tar.xz sigen-fa4764c9e4d86fdfa976bb9fa9f6976e82c496d5.zip | |
[FIX] ScriptWidget editing now works a lot better
[FIX] Kate settings saved
[FIX] Assertions within TeamMember removed
[FIX] Arenas inherit from Config now
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@238 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokebattle/Arena.cpp')
| -rw-r--r-- | pokebattle/Arena.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pokebattle/Arena.cpp b/pokebattle/Arena.cpp index be7b3605..6ab004c2 100644 --- a/pokebattle/Arena.cpp +++ b/pokebattle/Arena.cpp @@ -44,7 +44,8 @@ Pokebattle::TeamMember::Action Pokebattle::decision(TeamMember* teamMember) QSet<int> Pokebattle::Arena::m_arenaIds; -Pokebattle::Arena::Arena(QList<Player*> players) : +Pokebattle::Arena::Arena(QList<Player*> players, QObject* parent) : + Pokescripting::Config(parent), m_players(players), m_id(0) { |