diff options
Diffstat (limited to 'pokescripting/PokemodWrapper.cpp')
| -rw-r--r-- | pokescripting/PokemodWrapper.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pokescripting/PokemodWrapper.cpp b/pokescripting/PokemodWrapper.cpp index 4e17f4f6..65befc51 100644 --- a/pokescripting/PokemodWrapper.cpp +++ b/pokescripting/PokemodWrapper.cpp @@ -44,8 +44,8 @@ #include "TypeWrapper.h" #include "WeatherWrapper.h" -Pokescripting::PokemodWrapper::PokemodWrapper(const Pokemod::Pokemod* pokemod, QObject* parent) : - ObjectWrapper(pokemod, parent), +Pokescripting::PokemodWrapper::PokemodWrapper(const Pokemod::Pokemod* pokemod) : + ObjectWrapper(pokemod, NULL), m_pokemod(pokemod) { } @@ -188,7 +188,7 @@ QString Pokescripting::PokemodWrapper::description() const Pokescripting::MapWarpWrapper* Pokescripting::PokemodWrapper::startWarp() { - return MapWarpWrapper::create(m_pokemod->mapById(m_pokemod->startMap())->warpById(m_pokemod->startWarp()), this); + return map(m_pokemod->startMap())->warp(m_pokemod->startWarp()); } Pokemod::Fraction Pokescripting::PokemodWrapper::effectiveness(const TypeWrapper* attacker, const TypeWrapper* defender) const |