[DEL] Removed PokeGen namespace

[ADD] general/AudioCache.h completed
[DEL] VERSION removed from subdir .pro files
[DEL] audio/

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@33 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 7 insertions, 7 deletions

diff --git a/battle/Team.cpp b/battle/Team.cpp
index 2045d683..9bdc57f4 100644
--- a/battle/Team.cpp
+++ b/battle/Team.cpp
@@ -22,19 +22,19 @@
 
 #include "Team.h"
 
-PokeGen::Battle::Team::Team(PokeMod::Pokemod* par) :
+Team::Team(const PokeMod::Pokemod& par) :
         active(0),
         parent(par)
 {
 }
 
-void PokeGen::Battle::Team::AddItem(const unsigned i, const unsigned amt)
+void Team::AddItem(const unsigned i, const unsigned amt)
 {
     if (amt)
         items[i] = amt;
 }
 
-void PokeGen::Battle::Team::UseItem(const unsigned i)
+void Team::UseItem(const unsigned i)
 {
     if (items.contains(i) && (items[i] != UINT_MAX))
     {
@@ -44,12 +44,12 @@ void PokeGen::Battle::Team::UseItem(const unsigned i)
     }
 }
 
-void PokeGen::Battle::Team::AddPokemon(Pokemon& p)
+void Team::AddPokemon(Pokemon& p)
 {
     pokemon.append(&p);
 }
 
-void PokeGen::Battle::Team::SwapPokemon(const unsigned a, const unsigned b)
+void Team::SwapPokemon(const unsigned a, const unsigned b)
 {
     if ((a < pokemon.size()) && (b < pokemon.size()))
     {
@@ -59,13 +59,13 @@ void PokeGen::Battle::Team::SwapPokemon(const unsigned a, const unsigned b)
     }
 }
 
-bool PokeGen::Battle::Team::SetActivePokemon(const unsigned a)
+bool Team::SetActivePokemon(const unsigned a)
 {
     if ((a < pokemon.size()) && pokemon[a]->CanFight())
         active = a;
 }
 
-unsigned PokeGen::Battle::Team::CanFight() const
+unsigned Team::CanFight() const
 {
     unsigned alive = 0;
     for (unsigned i = 0; (i < pokemon.size()) && !alive; ++i)