diff options
Diffstat (limited to 'pokemod/MapTrainer.cpp')
| -rw-r--r-- | pokemod/MapTrainer.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pokemod/MapTrainer.cpp b/pokemod/MapTrainer.cpp index 03d0fcba..2da60aa2 100644 --- a/pokemod/MapTrainer.cpp +++ b/pokemod/MapTrainer.cpp @@ -41,7 +41,7 @@ MapTrainer::MapTrainer(const Map* parent, const int id) : m_sight(0), m_direction(INT_MAX), m_numberFight(1), - m_flag(0, 0), + m_appearFlag(0, 0), m_dialog(INT_MAX), m_leadTeamMember(INT_MAX) { @@ -95,7 +95,7 @@ void MapTrainer::load(const QDomElement& xml, int id) LOAD(int, sight); LOAD(int, direction); LOAD(int, numberFight); - LOAD(Flag, flag); + LOAD(Flag, appearFlag); LOAD(int, dialog); LOAD_SUB(newTeamMember, MapTrainerTeamMember); LOAD(int, leadTeamMember); @@ -110,7 +110,7 @@ QDomElement MapTrainer::save() const SAVE(int, sight); SAVE(int, direction); SAVE(int, numberFight); - SAVE(Flag, flag); + SAVE(Flag, appearFlag); SAVE(int, dialog); SAVE_SUB(MapTrainerTeamMember, teamMember); return xml; @@ -166,9 +166,9 @@ void MapTrainer::setNumberFight(const int numberFight) m_numberFight = numberFight; } -void MapTrainer::setFlag(const Flag& flag) +void MapTrainer::setAppearFlag(const Flag& appearFlag) { - m_flag = flag; + m_appearFlag = appearFlag; } void MapTrainer::setDialog(const int dialog) @@ -221,9 +221,9 @@ int MapTrainer::numberFight() const return m_numberFight; } -Flag MapTrainer::flag() const +Flag MapTrainer::appearFlag() const { - return m_flag; + return m_appearFlag; } int MapTrainer::dialog() const @@ -328,7 +328,7 @@ MapTrainer& MapTrainer::operator=(const MapTrainer& rhs) COPY(sight); COPY(direction); COPY(numberFight); - COPY(flag); + COPY(appearFlag); COPY(dialog); COPY(leadTeamMember); COPY_SUB(MapTrainerTeamMember, teamMember); |