From c1793a87ebea8c8e1bb2d5d1a409d105bfae3871 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 18 Aug 2008 18:51:31 +0000 Subject: [FIX] Script to make a tarball now defaults to HEAD for the revision [FIX] Enumeration types used to help remove some checks [FIX] Macro code moved to static members of Object (not all though) [FIX] Scripting wrappers now share information by keeping track of already-created instances of the wrapper [FIX] Scripting methods are now Q_SCRIPTABLE and not slots git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@239 6ecfd1a5-f3ed-3746-8530-beee90d26b22 --- pokescripting/PokemodWrapper.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pokescripting/PokemodWrapper.cpp') 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 -- cgit