diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-07-20 05:57:23 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-07-20 05:57:23 +0000 |
| commit | a44d3c2ebd20e05c7c574cd3a13888fc471067b9 (patch) | |
| tree | ed5b1750e4e074eb1cf01a59913b97d9e9ce2f43 /pokemod/Pokemod.cpp | |
| parent | ac55d15e484e2357954af3a6a3573c79fbbd88d8 (diff) | |
| download | sigen-a44d3c2ebd20e05c7c574cd3a13888fc471067b9.tar.gz sigen-a44d3c2ebd20e05c7c574cd3a13888fc471067b9.tar.xz sigen-a44d3c2ebd20e05c7c574cd3a13888fc471067b9.zip | |
[ADD] Added pokescripting to the spec file
[FIX] Added status tips and whats this tags to widgets in pokemodr
[FIX] Removed the list sprite for the species
[FIX] No more nidoran group needed (scripts should take care of it)
[FIX] Height no longer broken between feet and inches
[FIX] Fixed a bug in the TeamMember stat generation
[FIX] No more global skins; should be scripted
[FIX] Missed somt COPY() macros
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@227 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemod/Pokemod.cpp')
| -rw-r--r-- | pokemod/Pokemod.cpp | 115 |
1 files changed, 0 insertions, 115 deletions
diff --git a/pokemod/Pokemod.cpp b/pokemod/Pokemod.cpp index e4ea1117..aec463ee 100644 --- a/pokemod/Pokemod.cpp +++ b/pokemod/Pokemod.cpp @@ -44,7 +44,6 @@ #include "Weather.h" // Qt includes -#include <QtCore/QBuffer> #include <QtCore/QSet> Pokemod::Pokemod::Pokemod() : @@ -54,12 +53,6 @@ Pokemod::Pokemod::Pokemod() : m_description(""), m_startMap(INT_MAX), m_startWarp(INT_MAX), - m_walkSkin(192, 128), - m_bikeSkin(192, 128), - m_surfSkin(192, 128), - m_flySkin(192, 128), - m_fishSkin(192, 128), - m_surfFishSkin(192, 128), m_typechart(0, 0), m_rules(new Rules(this)) { @@ -279,12 +272,6 @@ void Pokemod::Pokemod::load(const QDomElement& xml) LOAD(QString, description); LOAD(int, startMap); LOAD(int, startWarp); - LOAD(QPixmap, walkSkin); - LOAD(QPixmap, bikeSkin); - LOAD(QPixmap, surfSkin); - LOAD(QPixmap, flySkin); - LOAD(QPixmap, fishSkin); - LOAD(QPixmap, surfFishSkin); LOAD_Rules(); LOAD_SUB(newAbility, Ability); LOAD_SUB(newAuthor, Author); @@ -318,12 +305,6 @@ QDomElement Pokemod::Pokemod::save() const SAVE(QString, description); SAVE(int, startMap); SAVE(int, startWarp); - SAVE(QPixmap, walkSkin); - SAVE(QPixmap, bikeSkin); - SAVE(QPixmap, surfSkin); - SAVE(QPixmap, flySkin); - SAVE(QPixmap, fishSkin); - SAVE(QPixmap, surfFishSkin); SAVE_Rules(rules); SAVE_MATRIX(Fraction, typechart); SAVE_SUB(Ability, abilities); @@ -390,72 +371,6 @@ void Pokemod::Pokemod::setStartWarp(const int startWarp) CHECK(startWarp); } -void Pokemod::Pokemod::setWalkSkin(const QPixmap& walkSkin) -{ - if (walkSkin.size() != QSize(192, 128)) - { - emit(error(size("walkSkin"))); - return; - } - m_walkSkin = walkSkin; - emit(changed()); -} - -void Pokemod::Pokemod::setBikeSkin(const QPixmap& bikeSkin) -{ - if (bikeSkin.size() != QSize(192, 128)) - { - emit(error(size("bikeSkin"))); - return; - } - m_bikeSkin = bikeSkin; - emit(changed()); -} - -void Pokemod::Pokemod::setSurfSkin(const QPixmap& surfSkin) -{ - if (surfSkin.size() != QSize(192, 128)) - { - emit(error(size("surfSkin"))); - return; - } - m_surfSkin = surfSkin; - emit(changed()); -} - -void Pokemod::Pokemod::setFlySkin(const QPixmap& flySkin) -{ - if (flySkin.size() != QSize(192, 128)) - { - emit(error(size("flySkin"))); - return; - } - m_flySkin = flySkin; - emit(changed()); -} - -void Pokemod::Pokemod::setFishSkin(const QPixmap& fishSkin) -{ - if (fishSkin.size() != QSize(192, 128)) - { - emit(error(size("fishSkin"))); - return; - } - m_fishSkin = fishSkin; - emit(changed()); -} - -void Pokemod::Pokemod::setSurfFishSkin(const QPixmap& surfFishSkin) -{ - if (surfFishSkin.size() != QSize(192, 128)) - { - emit(error(size("surfFishSkin"))); - return; - } - m_surfFishSkin = surfFishSkin; - emit(changed()); -} - void Pokemod::Pokemod::setTypechart(const int attack, const int defense, const Fraction& multiplier) { CHECK_ARRAY(typechart(attack, defense), multiplier); @@ -496,36 +411,6 @@ int Pokemod::Pokemod::startWarp() const return m_startWarp; } -QPixmap Pokemod::Pokemod::walkSkin() const -{ - return m_walkSkin; -} - -QPixmap Pokemod::Pokemod::bikeSkin() const -{ - return m_bikeSkin; -} - -QPixmap Pokemod::Pokemod::surfSkin() const -{ - return m_surfSkin; -} - -QPixmap Pokemod::Pokemod::flySkin() const -{ - return m_flySkin; -} - -QPixmap Pokemod::Pokemod::fishSkin() const -{ - return m_fishSkin; -} - -QPixmap Pokemod::Pokemod::surfFishSkin() const -{ - return m_surfFishSkin; -} - const Pokemod::Matrix<Pokemod::Fraction>* Pokemod::Pokemod::typechart() const { return &m_typechart; |
