diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-06-10 03:43:25 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-06-10 03:43:25 +0000 |
| commit | e8ab06e91abab6a7e0af2fb3331aff6d95c3ed58 (patch) | |
| tree | b038f4032cb695551e08bb6712a895e30a2ee44b | |
| parent | 60ec161d7df28c3147e86f7344a9a548b7682aee (diff) | |
[FIX] Fixed up some build errors with pokebattle
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@206 6ecfd1a5-f3ed-3746-8530-beee90d26b22
| -rw-r--r-- | Changelog | 7 | ||||
| -rw-r--r-- | pokebattle/Arena.cpp | 1 | ||||
| -rw-r--r-- | pokebattle/Team.h | 1 | ||||
| -rw-r--r-- | pokebattle/pokebattle.pro | 3 |
4 files changed, 10 insertions, 2 deletions
@@ -1,4 +1,11 @@ ----------------- +Rev: 205 +Date: 9 June 2008 +User: MathStuf +----------------- +[FIX] Fixed up some build errors with pokebattle + +----------------- Rev: 204 Date: 9 June 2008 User: MathStuf diff --git a/pokebattle/Arena.cpp b/pokebattle/Arena.cpp index 7c7cf776..475af96b 100644 --- a/pokebattle/Arena.cpp +++ b/pokebattle/Arena.cpp @@ -26,6 +26,7 @@ #include <kross/core/childreninterface.h> Pokebattle::Arena::Arena* Pokebattle::Arena::m_arena = 0; +QList<Pokebattle::Team*> Pokebattle::Arena::m_teams; Kross::ActionCollection* Pokebattle::Arena::m_actions = 0; Pokebattle::Arena::~Arena() diff --git a/pokebattle/Team.h b/pokebattle/Team.h index 8986a9ca..5a934bc9 100644 --- a/pokebattle/Team.h +++ b/pokebattle/Team.h @@ -35,7 +35,6 @@ class Team : public QObject void teamKnockedOut(); public slots: protected slots: - void memberFainted(TeamMember* member); protected: private: QList<TeamMember*> m_members; diff --git a/pokebattle/pokebattle.pro b/pokebattle/pokebattle.pro index 55771a2f..36eef4fb 100644 --- a/pokebattle/pokebattle.pro +++ b/pokebattle/pokebattle.pro @@ -6,7 +6,8 @@ DOC_DIR = ../doc DESTDIR = ../bin INSTALLDIR = lib$$system(kde4-config --libsuffix) LIBS += -L../bin \ - -lpokemod + -lpokemod \ + -lkrosscore CONFIG += qt \ warn_on \ |