From 4385af885daf460a18e236f08509358f764b2c8c Mon Sep 17 00:00:00 2001
From: Ben Boeckel <MathStuf@gmail.com>
Date: Fri, 26 Oct 2007 20:46:09 +0000
Subject: Reverted repo back to rev24 because committing of rev25 messed up

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@26 6ecfd1a5-f3ed-3746-8530-beee90d26b22
---
 pokemod/Dialog.cpp | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

(limited to 'pokemod/Dialog.cpp')

diff --git a/pokemod/Dialog.cpp b/pokemod/Dialog.cpp
index 3c146d06..4d13515f 100644
--- a/pokemod/Dialog.cpp
+++ b/pokemod/Dialog.cpp
@@ -22,10 +22,6 @@
 
 #include "Dialog.h"
 
-const char* PokeGen::PokeMod::Dialog::CommandStr[PokeGen::PokeMod::Dialog::End] = {"Flip Flag", "Set Flag", "Unset Flag", "Randomize Flag", "Test Flag", "Dialog", "Yes/No", "Item Shop", "Give Item", "Take Item", "Check Item", "Coin List", "Teach Move", "Delete Move", "Give Pokemon", "Take Pokemon", "Show Pokemon", "View Pokemon", "Give Money", "Take Money", "Move Effect", "Turn Effect", "Check Direction", "Check Roster", "Check Levels", "Check Species", "Check Held Items", "Check Money", "Trade", "Daycare", "Battle", "Badge", "Warp", "Name", "Music", "Sound Effect", "Timer", "Map Sign", "Wild Scope", "Safari", "Heal Party", "Refresh", "Clear", "Pause", "New Line", "Exit", "Menu"};
-const char* PokeGen::PokeMod::Dialog::CommandAbbrStr[PokeGen::PokeMod::Dialog::End] = {"FF", "SF", "UF", "RF", "TF", "D", "YN", "ItS", "GIt", "TIt", "CIt", "CL", "TMv", "DMv", "GPk", "TPk", "SPk", "VPk", "G$", "T$", "MvEf", "TEf", "CD", "CR", "CLv", "CS", "CHIt", "C$", "T", "Dc", "Bat", "Bdg", "W", "N", "Ms", "SFX", "Tmr", "MS", "WS", "S", "HP", "R", "C", "P", "NL", "X", "M"};
-const unsigned PokeGen::PokeMod::Dialog::CommandNumArgs[PokeGen::PokeMod::Dialog::Menu] = {1, 1, 1, 1, 3, 2, 2, 1, 4, 4, 4, 1, 5, 3, 7, 4, 1, 4, 1, 4, 6, 3, 6, 5, 5, 4, 4, 5, 6, 1, 2, 1, 2, 1, 2, 1, 3, 1, 1, 3, 0, 0, 0, 0, 0, 0};
-
 PokeGen::PokeMod::Dialog::Dialog(const Pokemod* par, const unsigned _id) :
         Object(_id, par),
         dialog("")
@@ -246,7 +242,7 @@ bool PokeGen::PokeMod::Dialog::Validate()
                                             invError = 1;
                                         break;
                                     case 2:
-                                        if (!okU || (pokemod->GetSpeciesByID(tempU) ==UINT_MAX))
+                                        if (!okU || (pokemod->GetPokemonByID(tempU) ==UINT_MAX))
                                             invError = 2;
                                         break;
                                     case 3:
@@ -285,7 +281,7 @@ bool PokeGen::PokeMod::Dialog::Validate()
                                             invError = 1;
                                         break;
                                     case 2:
-                                        if (!okU || (pokemod->GetSpeciesByID(tempU) == UINT_MAX))
+                                        if (!okU || (pokemod->GetPokemonByID(tempU) == UINT_MAX))
                                             invError = 2;
                                         break;
                                     case 3:
@@ -297,7 +293,7 @@ bool PokeGen::PokeMod::Dialog::Validate()
                             case ShowPokemon:
                                 if (numArgs == 1)
                                 {
-                                    if (!okU || (pokemod->GetSpeciesByID(tempU) == UINT_MAX))
+                                    if (!okU || (pokemod->GetPokemonByID(tempU) == UINT_MAX))
                                         invError = 1;
                                 }
                                 break;
@@ -447,7 +443,7 @@ bool PokeGen::PokeMod::Dialog::Validate()
                                         break;
                                     case 2:
                                     case 3:
-                                        if (!okU || (pokemod->GetSpeciesByID(tempU) == UINT_MAX))
+                                        if (!okU || (pokemod->GetPokemonByID(tempU) == UINT_MAX))
                                             invError = numArgs;
                                     case 4:
                                         if (!okUL)
@@ -516,23 +512,12 @@ bool PokeGen::PokeMod::Dialog::Validate()
                                 }
                                 break;
                             case Music:
-                                if (numArgs == 1)
-                                {
-                                    if (!QFile(pokemod->GetPath() + "music/" + arg).exists())
-                                        invError = 1;
-                                }
-                                break;
                             case SoundEffect:
                                 if (numArgs == 1)
                                 {
                                     if (!QFile(pokemod->GetPath() + "sound/" + arg).exists())
                                         invError = 1;
                                 }
-                                else if (numArgs == 2)
-                                {
-                                    if (!okU)
-                                        invError = 2;
-                                }
                                 break;
                             case Timer:
                                 switch (numArgs)
-- 
cgit