Minor various fixes, Dialog validation started, GUI fixes, String methods added

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

1 files changed, 9 insertions, 9 deletions

diff --git a/pokemod/Badge.cpp b/pokemod/Badge.cpp
index 6edef52a..870ab46a 100644
--- a/pokemod/Badge.cpp
+++ b/pokemod/Badge.cpp
@@ -64,7 +64,7 @@ void PokeGen::PokeMod::Badge::Validate()
       LogVarNotValid("Badge", id, "face sprite", name);

       isValid = false;

    }

-   if (!Path(pokemod->GetPath() + "badge/badge/" + name + ".png").DoesExist())
+   if (!Path(pokemod->GetPath() + "badge/badge/" + name + ".png").DoesExist())

    {

       LogVarNotValid("Badge", id, "badge sprite", name);

       isValid = false;

@@ -84,15 +84,15 @@ void PokeGen::PokeMod::Badge::Validate(const wxListBox &output)
       output.Append(ConsoleLogVarNotSet("Badge", id, "name"));

       isValid = false;

    }

-   if (!Path(pokemod->GetPath() + "badge/face/" + name + ".png").DoesExist())
-   {
-      LogVarNotValid("Badge", id, "face sprite", name);
+   if (!Path(pokemod->GetPath() + "badge/face/" + name + ".png").DoesExist())

+   {

+      LogVarNotValid("Badge", id, "face sprite", name);

       output.Append(ConsoleLogVarNotValid("Badge", "face sprite", id, name));

       isValid = false;

    }

-   if (!Path(pokemod->GetPath() + "badge/badge/" + name + ".png").DoesExist())
-   {
-      LogVarNotValid("Badge", id, "badge sprite", name);
+   if (!Path(pokemod->GetPath() + "badge/badge/" + name + ".png").DoesExist())

+   {

+      LogVarNotValid("Badge", id, "badge sprite", name);

       output.Append(ConsoleLogVarNotValid("Badge", "badge sprite", id, name));

       isValid = false;

    }

@@ -150,13 +150,13 @@ void PokeGen::PokeMod::Badge::SetName(const String &n)
    name = n;

 }

 

-void PokeGen::PokeMod::Badge::SetFace(const Path &f)

+void PokeGen::PokeMod::Badge::SetFace(Path &f)

 {

    LogSetVar("Badge", id, "face", f, name);

    f.CopyTo(pokemod->GetPath() + "badge/face/" + name + ".png");

 }

 

-void PokeGen::PokeMod::Badge::SetBadge(const Path &b)

+void PokeGen::PokeMod::Badge::SetBadge(Path &b)

 {

    LogSetVar("Badge", id, "badge", b, name);

    b.CopyTo(pokemod->GetPath() + "badge/badge/" + name + ".png");