diff options
Diffstat (limited to 'pokemod/MoveEffect.cpp')
| -rw-r--r-- | pokemod/MoveEffect.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/pokemod/MoveEffect.cpp b/pokemod/MoveEffect.cpp index 388ed6c3..18a1f3d1 100644 --- a/pokemod/MoveEffect.cpp +++ b/pokemod/MoveEffect.cpp @@ -6,19 +6,18 @@ // Created: Tue Mar 20 18:29:40 2007
// Copyright: ©2007 Ben Boeckel and Nerdy Productions
// Licence:
-// This program is free software; you can redistribute it and/or modify
+// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+// with this program. If not, see <http://www.gnu.org/licenses/>.
/////////////////////////////////////////////////////////////////////////////
#include "MoveEffect.h"
@@ -75,7 +74,7 @@ void PokeGen::PokeMod::MoveEffect::ImportIni(Ini &ini, const unsigned _id) ini.GetValue("val2", val2);
}
-void PokeGen::PokeMod::MoveEffect::ExportIni(std::ofstream &fout, const String &move) const
+void PokeGen::PokeMod::MoveEffect::ExportIni(QFile &fout, const QString &move) const
{
LogExportStart("MoveEffect", id);
Ini exMoveEffect(move + " moveEffect");
@@ -124,7 +123,7 @@ void PokeGen::PokeMod::MoveEffect::SetEffect(const unsigned e) }
}
-void PokeGen::PokeMod::MoveEffect::SetEffect(const String &e)
+void PokeGen::PokeMod::MoveEffect::SetEffect(const QString &e)
{
SetEffect(FindIn(ME_END, e, MoveEffectStr));
}
@@ -142,7 +141,7 @@ void PokeGen::PokeMod::MoveEffect::SetVal2(const unsigned v2) val2 = v2;
}
-void PokeGen::PokeMod::MoveEffect::SetVal2(const String &v2)
+void PokeGen::PokeMod::MoveEffect::SetVal2(const QString &v2)
{
LogSetVar("MoveEffect", id, "val2 string", v2);
val2 = 0;
@@ -172,7 +171,7 @@ unsigned PokeGen::PokeMod::MoveEffect::GetEffect() const return effect;
}
-PokeGen::PokeMod::String PokeGen::PokeMod::MoveEffect::GetEffectString() const
+QString PokeGen::PokeMod::MoveEffect::GetEffectString() const
{
LogFetchVar("MoveEffect", id, "effect string", MoveEffectStr[effect]);
if (effect < ME_END)
@@ -192,7 +191,7 @@ unsigned PokeGen::PokeMod::MoveEffect::GetVal2() const return val2;
}
-PokeGen::PokeMod::String PokeGen::PokeMod::MoveEffect::GetVal2String() const
+QString PokeGen::PokeMod::MoveEffect::GetVal2String() const
{
LogFetchVar("MoveEffect", id, "val2 string", val2);
// TODO (Ben#1#): Val2 string
|