Lots of minor fixes, added TODO file, Move methods

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

1 files changed, 21 insertions, 15 deletions

diff --git a/pokemod/ItemEffect.cpp b/pokemod/ItemEffect.cpp
index 2192d56b..ee0b6432 100644
--- a/pokemod/ItemEffect.cpp
+++ b/pokemod/ItemEffect.cpp
@@ -139,7 +139,7 @@ void PokeGen::PokeMod::ItemEffect::SetEffect(const int e)
       effect = e;

       val1 = -1;

       val2 = -1;

-      val3.Set(1, 1, (e == IE_BALL) || (e == IE_TYPE) || (e == IE_PP_BOOST));

+      val3.Set(1, 1, (e == IE_BALL) || (e == IE_TYPE_BOOST) || (e == IE_PP_BOOST));

       val4 = -1;

       val5 = -1;

    }

@@ -153,7 +153,7 @@ void PokeGen::PokeMod::ItemEffect::SetEffect(const String &e)
    {

       val1 = -1;

       val2 = -1;

-      val3.Set(1, 1, (e == IE_BALL) || (e == IE_TYPE) || (e == IE_PP_BOOST));

+      val3.Set(1, 1, (e == ItemEffectStr[IE_BALL]) || (e == ItemEffectStr[IE_TYPE_BOOST]) || (e == ItemEffectStr[IE_PP_BOOST]));

       val4 = -1;

       val5 = -1;

    }

@@ -299,7 +299,7 @@ void PokeGen::PokeMod::ItemEffect::SetVal2(const int v2)
    }

 }

 

-void PokeGen::PokeMod::ItemEffect::SetVal3(const PMFrac &v3)

+void PokeGen::PokeMod::ItemEffect::SetVal3(const Frac &v3)

 {

    switch (effect)

    {

@@ -365,7 +365,7 @@ void PokeGen::PokeMod::ItemEffect::SetVal3(const unsigned n, const unsigned d)
       case IE_EXP_SHARE:

       case IE_REPEL:

          PMLog(PMString("ItemEffect: Setting val3 (%s)", ItemEffectStr[effect]), PM_DEBUG_DEBUG);

-         val3.Set(n, d)

+         val3.Set(n, d);

          break;

       case IE_CURE_STATUS:

       case IE_LEVEL_BOOST:

@@ -414,7 +414,7 @@ void PokeGen::PokeMod::ItemEffect::SetVal3Num(const unsigned n)
       case IE_EXP_SHARE:

       case IE_REPEL:

          PMLog(PMString("ItemEffect: Setting val3 (%s)", ItemEffectStr[effect]), PM_DEBUG_DEBUG);

-         val3.SetNum(n)

+         val3.SetNum(n);

          break;

       case IE_CURE_STATUS:

       case IE_LEVEL_BOOST:

@@ -463,7 +463,7 @@ void PokeGen::PokeMod::ItemEffect::SetVal3Denom(const unsigned d)
       case IE_EXP_SHARE:

       case IE_REPEL:

          PMLog(PMString("ItemEffect: Setting val3 (%s)", ItemEffectStr[effect]), PM_DEBUG_DEBUG);

-         val3.SetDenom(d)

+         val3.SetDenom(d);

          break;

       case IE_CURE_STATUS:

       case IE_LEVEL_BOOST:

@@ -589,7 +589,7 @@ void PokeGen::PokeMod::ItemEffect::SetVal4(const int v4)
    }

 }

 

-void PokeGen::PokeMod::ItemEffect::SetVal4(const PMString &v4)

+void PokeGen::PokeMod::ItemEffect::SetVal4(const String &v4)

 {

    switch (effect)

    {

@@ -699,7 +699,7 @@ void PokeGen::PokeMod::ItemEffect::SetVal5(const int v5)
    }

 }

 

-void PokeGen::PokeMod::ItemEffect::SetVal5(const PMString &v5)

+void PokeGen::PokeMod::ItemEffect::SetVal5(const String &v5)

 {

    switch (effect)

    {

@@ -769,7 +769,7 @@ int PokeGen::PokeMod::ItemEffect::GetEffect() const
    return effect;

 }

 

- PokeGen::PokeMod::ItemEffect::GetVal1() const

+int PokeGen::PokeMod::ItemEffect::GetVal1() const

 {

    PMLog("ItemEffect: Fetching val1", PM_DEBUG_DEBUG);

    return val1;

@@ -781,13 +781,19 @@ int PokeGen::PokeMod::ItemEffect::GetVal2() const
    return val2;

 }

 

-int PokeGen::PokeMod::ItemEffect::GetVal3() const

+PokeGen::PokeMod::Frac PokeGen::PokeMod::ItemEffect::GetVal3() const

 {

    PMLog("ItemEffect: Fetching val3", PM_DEBUG_DEBUG);

    return val3;

 }

 

-PokeGen::PokeMod::PMString PokeGen::PokeMod::ItemEffect::GetVal3String() const

+unsigned PokeGen::PokeMod::ItemEffect::GetVal3Num() const

+{

+   PMLog("ItemEffect: Fetching val3", PM_DEBUG_DEBUG);

+   return val3;

+}

+

+unsigned PokeGen::PokeMod::ItemEffect::GetVal3Denom() const

 {

    PMLog("ItemEffect: Fetching val3", PM_DEBUG_DEBUG);

    return val3;

@@ -799,10 +805,10 @@ int PokeGen::PokeMod::ItemEffect::GetVal4() const
    return val4;

 }

 

-PokeGen::PokeMod::PMString PokeGen::PokeMod::ItemEffect::GetVal4String() const

+PokeGen::PokeMod::String PokeGen::PokeMod::ItemEffect::GetVal4String() const

 {

    PMLog("ItemEffect: Fetching val4", PM_DEBUG_DEBUG);

-   return val4;

+   return "";

 }

 

 int PokeGen::PokeMod::ItemEffect::GetVal5() const

@@ -811,8 +817,8 @@ int PokeGen::PokeMod::ItemEffect::GetVal5() const
    return val5;

 }

 

-PokeGen::PokeMod::PMString PokeGen::PokeMod::ItemEffect::GetVal5String() const

+PokeGen::PokeMod::String PokeGen::PokeMod::ItemEffect::GetVal5String() const

 {

    PMLog("ItemEffect: Fetching val5", PM_DEBUG_DEBUG);

-   return val5;

+   return "";

 }