summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2008-02-19 04:33:15 +0000
committerBen Boeckel <MathStuf@gmail.com>2008-02-19 04:33:15 +0000
commite84eeccd73b0d278d883e6cd6a2b793b3e93d4d7 (patch)
treea51bf0addc10f84f1053f2dcdd16e9c74f131edc
parenta47a7aa7508e18292ace9299692f0e197d7a915a (diff)
downloadsigen-e84eeccd73b0d278d883e6cd6a2b793b3e93d4d7.tar.gz
sigen-e84eeccd73b0d278d883e6cd6a2b793b3e93d4d7.tar.xz
sigen-e84eeccd73b0d278d883e6cd6a2b793b3e93d4d7.zip
[FIX] Fixed GPL headers in source files from rogue find/replace
[ADD] SpeciesAbilityUI.{h, cpp} [ADD] pokemodr TODO list git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@62 6ecfd1a5-f3ed-3746-8530-beee90d26b22
-rw-r--r--Changelog9
-rw-r--r--pokemod/Map.cpp2
-rw-r--r--pokemod/Object.h2
-rw-r--r--pokemod/Species.cpp2
-rw-r--r--pokemod/Species.h2
-rw-r--r--pokemod/Tile.cpp2
-rw-r--r--pokemodr/CoinListObjectUI.cpp2
-rw-r--r--pokemodr/CoinListObjectUI.h2
-rw-r--r--pokemodr/CoinListUI.cpp2
-rw-r--r--pokemodr/CoinListUI.h2
-rw-r--r--pokemodr/EggGroupUI.cpp2
-rw-r--r--pokemodr/EggGroupUI.h2
-rw-r--r--pokemodr/ImageDialog.cpp2
-rw-r--r--pokemodr/ImageDialog.h2
-rw-r--r--pokemodr/ItemUI.cpp2
-rw-r--r--pokemodr/ItemUI.h2
-rw-r--r--pokemodr/MapUI.cpp2
-rw-r--r--pokemodr/MapUI.h2
-rw-r--r--pokemodr/SpeciesAbilityUI.cpp95
-rw-r--r--pokemodr/SpeciesAbilityUI.h56
-rw-r--r--pokemodr/SpeciesItemUI.cpp2
-rw-r--r--pokemodr/SpeciesItemUI.h2
-rw-r--r--pokemodr/SpeciesMoveUI.cpp2
-rw-r--r--pokemodr/SpeciesMoveUI.h2
-rw-r--r--pokemodr/TODO16
-rw-r--r--pokemodr/TileDelegate.cpp2
-rw-r--r--pokemodr/TileDelegate.h2
-rw-r--r--pokemodr/TilemapModel.cpp2
-rw-r--r--pokemodr/TilemapModel.h2
29 files changed, 201 insertions, 25 deletions
diff --git a/Changelog b/Changelog
index d8bbc7f9..8ac8b644 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,13 @@
-----------------
+Rev: 62
+Date: 18 February 2008
+User: MathStuf
+-----------------
+[FIX] Fixed GPL headers in source files from rogue find/replace
+[ADD] SpeciesAbilityUI.{h, cpp}
+[ADD] pokemodr TODO list
+
+-----------------
Rev: 61
Date: 18 February 2008
User: MathStuf
diff --git a/pokemod/Map.cpp b/pokemod/Map.cpp
index b9385707..dd54b415 100644
--- a/pokemod/Map.cpp
+++ b/pokemod/Map.cpp
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTMap or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemod/Object.h b/pokemod/Object.h
index f970d99e..4ae96557 100644
--- a/pokemod/Object.h
+++ b/pokemod/Object.h
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTCLASS or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemod/Species.cpp b/pokemod/Species.cpp
index 67c043ee..8e5db881 100644
--- a/pokemod/Species.cpp
+++ b/pokemod/Species.cpp
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTSpecies or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemod/Species.h b/pokemod/Species.h
index c4437e83..48d7f0f7 100644
--- a/pokemod/Species.h
+++ b/pokemod/Species.h
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTSpecies or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemod/Tile.cpp b/pokemod/Tile.cpp
index 31e79cf1..7f9e319e 100644
--- a/pokemod/Tile.cpp
+++ b/pokemod/Tile.cpp
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTTile or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemodr/CoinListObjectUI.cpp b/pokemodr/CoinListObjectUI.cpp
index c0fbfe8e..32664b27 100644
--- a/pokemodr/CoinListObjectUI.cpp
+++ b/pokemodr/CoinListObjectUI.cpp
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTCoinListObject or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemodr/CoinListObjectUI.h b/pokemodr/CoinListObjectUI.h
index e7134b34..1f8c6d95 100644
--- a/pokemodr/CoinListObjectUI.h
+++ b/pokemodr/CoinListObjectUI.h
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTCoinListObject or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemodr/CoinListUI.cpp b/pokemodr/CoinListUI.cpp
index b1ec330c..e2b61ee5 100644
--- a/pokemodr/CoinListUI.cpp
+++ b/pokemodr/CoinListUI.cpp
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTCoinList or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemodr/CoinListUI.h b/pokemodr/CoinListUI.h
index 22befccd..28244954 100644
--- a/pokemodr/CoinListUI.h
+++ b/pokemodr/CoinListUI.h
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTCoinList or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemodr/EggGroupUI.cpp b/pokemodr/EggGroupUI.cpp
index 94afe722..6dd65441 100644
--- a/pokemodr/EggGroupUI.cpp
+++ b/pokemodr/EggGroupUI.cpp
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTEggGroup or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemodr/EggGroupUI.h b/pokemodr/EggGroupUI.h
index e52e6738..7e14ead0 100644
--- a/pokemodr/EggGroupUI.h
+++ b/pokemodr/EggGroupUI.h
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTEggGroup or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemodr/ImageDialog.cpp b/pokemodr/ImageDialog.cpp
index 6c880efd..8deb2972 100644
--- a/pokemodr/ImageDialog.cpp
+++ b/pokemodr/ImageDialog.cpp
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTItem or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemodr/ImageDialog.h b/pokemodr/ImageDialog.h
index 728c7fb4..8238d511 100644
--- a/pokemodr/ImageDialog.h
+++ b/pokemodr/ImageDialog.h
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTItem or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemodr/ItemUI.cpp b/pokemodr/ItemUI.cpp
index 0c7a4ef5..74ff76ed 100644
--- a/pokemodr/ItemUI.cpp
+++ b/pokemodr/ItemUI.cpp
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTItem or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemodr/ItemUI.h b/pokemodr/ItemUI.h
index 3d42626b..4d70459f 100644
--- a/pokemodr/ItemUI.h
+++ b/pokemodr/ItemUI.h
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTItem or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemodr/MapUI.cpp b/pokemodr/MapUI.cpp
index 7d0927c1..f349cbc0 100644
--- a/pokemodr/MapUI.cpp
+++ b/pokemodr/MapUI.cpp
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTMap or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemodr/MapUI.h b/pokemodr/MapUI.h
index 32a6a2e0..4e11c3d9 100644
--- a/pokemodr/MapUI.h
+++ b/pokemodr/MapUI.h
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTMap or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemodr/SpeciesAbilityUI.cpp b/pokemodr/SpeciesAbilityUI.cpp
new file mode 100644
index 00000000..00af0e1f
--- /dev/null
+++ b/pokemodr/SpeciesAbilityUI.cpp
@@ -0,0 +1,95 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: pokegen/SpeciesAbilityUI.cpp
+// Purpose: SpeciesAbility UI form handling
+// Author: Ben Boeckel
+// Modified by: Ben Boeckel
+// Created: Mon Feb 18 18:08:16 2008
+// Copyright: ©2007-2008 Ben Boeckel and Nerdy Productions
+// Licence:
+// 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 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, see <http://www.gnu.org/licenses/>.
+/////////////////////////////////////////////////////////////////////////////
+
+#include <QMetaObject>
+#include <QStringListModel>
+#include <QVariant>
+#include "../general/BugCatcher.h"
+#include "../general/Exception.h"
+#include "../pokemod/Ability.h"
+#include "../pokemod/Pokemod.h"
+#include "SpeciesAbilityUI.h"
+
+SpeciesAbilityUI::SpeciesAbilityUI(SpeciesAbility* s, QWidget* parent) :
+ ObjectUI(parent),
+ speciesAbility(s),
+ speciesAbility_mod(new SpeciesAbility(s->getPokemod(), *s, s->getId()))
+{
+ setupUi(this);
+ QMetaObject::connectSlotsByName(this);
+ setObjects(speciesAbility, speciesAbility_mod);
+ for (int i = 0; i < speciesAbility->getPokemod()->getAbilityCount(); ++i)
+ varAbility->addItem(speciesAbility->getPokemod()->getAbility(i)->getName());
+ setGui();
+}
+
+// KToolbar SpeciesAbilityUI::getToolbar(QWidget* parent)
+// {
+//
+// }
+
+void SpeciesAbilityUI::setGui()
+{
+ varAbility->setCurrentIndex(speciesAbility->getPokemod()->getAbilityIndex(speciesAbility_mod->getAbility()));
+ varWildLevel->setValue(speciesAbility_mod->getWeight());
+}
+
+void SpeciesAbilityUI::on_buttonApply_clicked()
+{
+ *speciesAbility = *speciesAbility_mod;
+ emit(setChanged(false));
+}
+
+void SpeciesAbilityUI::on_buttonDiscard_clicked()
+{
+ *speciesAbility_mod = *speciesAbility;
+ emit(setChanged(false));
+ setGui();
+}
+
+void SpeciesAbilityUI::on_varAbility_currentIndexChanged(const int m)
+{
+ try
+ {
+ speciesAbility_mod->setAbility(speciesAbility->getPokemod()->getAbility(m)->getId());
+ emit(setChanged(true));
+ }
+ catch (BoundsException& e)
+ {
+ BugCatcher::report(e);
+ }
+ setGui();
+}
+
+void SpeciesAbilityUI::on_varWeight_valueChanged(const int w)
+{
+ try
+ {
+ speciesAbility_mod->setWeight(w);
+ emit(setChanged(true));
+ }
+ catch (BoundsException& e)
+ {
+ BugCatcher::report(e);
+ setGui();
+ }
+}
diff --git a/pokemodr/SpeciesAbilityUI.h b/pokemodr/SpeciesAbilityUI.h
new file mode 100644
index 00000000..7d7691c8
--- /dev/null
+++ b/pokemodr/SpeciesAbilityUI.h
@@ -0,0 +1,56 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: pokegen/SpeciesAbilityUI.h
+// Purpose: SpeciesAbility UI form handling
+// Author: Ben Boeckel
+// Modified by: Ben Boeckel
+// Created: Mon Feb 18 18:12:16 2008
+// Copyright: ©2007-2008 Ben Boeckel and Nerdy Productions
+// Licence:
+// 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 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, see <http://www.gnu.org/licenses/>.
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __POKEMODR_SPECIESABILITYUI__
+#define __POKEMODR_SPECIESABILITYUI__
+
+#include <ktoolbar.h>
+#include <QString>
+#include "../pokemod/SpeciesAbility.h"
+#include "ObjectUI.h"
+#include "ui_speciesAbility.h"
+
+class SpeciesAbilityUI : public ObjectUI, private Ui::formSpeciesAbility
+{
+ Q_OBJECT
+
+ public:
+ SpeciesAbilityUI(SpeciesAbility* s, QWidget* parent);
+ ~SpeciesAbilityUI()
+ {
+ delete speciesAbility_mod;
+ }
+
+// KToolbar getToolbar(QWidget* parent);
+ public slots:
+ void on_buttonApply_clicked();
+ void on_buttonDiscard_clicked();
+ void on_varAbility_currentIndexChanged(const int a);
+ void on_varWeight_valueChanged(const int w);
+ private:
+ void setGui();
+
+ SpeciesAbility* speciesAbility;
+ SpeciesAbility* speciesAbility_mod;
+};
+
+#endif
diff --git a/pokemodr/SpeciesItemUI.cpp b/pokemodr/SpeciesItemUI.cpp
index 2aa1ba60..f5fa60c7 100644
--- a/pokemodr/SpeciesItemUI.cpp
+++ b/pokemodr/SpeciesItemUI.cpp
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTSpeciesItem or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemodr/SpeciesItemUI.h b/pokemodr/SpeciesItemUI.h
index 52010f64..828dce37 100644
--- a/pokemodr/SpeciesItemUI.h
+++ b/pokemodr/SpeciesItemUI.h
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTSpeciesItem or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemodr/SpeciesMoveUI.cpp b/pokemodr/SpeciesMoveUI.cpp
index 346a6be8..1cabc72d 100644
--- a/pokemodr/SpeciesMoveUI.cpp
+++ b/pokemodr/SpeciesMoveUI.cpp
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTSpeciesMove or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemodr/SpeciesMoveUI.h b/pokemodr/SpeciesMoveUI.h
index ef5607b1..fbd6f466 100644
--- a/pokemodr/SpeciesMoveUI.h
+++ b/pokemodr/SpeciesMoveUI.h
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTSpeciesMove or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemodr/TODO b/pokemodr/TODO
new file mode 100644
index 00000000..e802eac0
--- /dev/null
+++ b/pokemodr/TODO
@@ -0,0 +1,16 @@
+AbilityEffect
+Dialog
+ItemEffect
+Map (tilemap Model-View-Delegate)
+MapEffect
+MapTrainer
+MapTrainerTeamMember
+MapWarp
+MapWildList
+MapWildListEncounter
+Move
+MoveEffect
+Pokemod
+Species
+SpeciesAbility
+SpeciesEvolution
diff --git a/pokemodr/TileDelegate.cpp b/pokemodr/TileDelegate.cpp
index 8330d3a8..2115632c 100644
--- a/pokemodr/TileDelegate.cpp
+++ b/pokemodr/TileDelegate.cpp
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTMap or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemodr/TileDelegate.h b/pokemodr/TileDelegate.h
index 470370e1..65184b92 100644
--- a/pokemodr/TileDelegate.h
+++ b/pokemodr/TileDelegate.h
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTMap or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemodr/TilemapModel.cpp b/pokemodr/TilemapModel.cpp
index b92d8cdb..f21c6371 100644
--- a/pokemodr/TilemapModel.cpp
+++ b/pokemodr/TilemapModel.cpp
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTMap or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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
diff --git a/pokemodr/TilemapModel.h b/pokemodr/TilemapModel.h
index 46a2b4a5..59bd441f 100644
--- a/pokemodr/TilemapModel.h
+++ b/pokemodr/TilemapModel.h
@@ -13,7 +13,7 @@
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTMap or FITNESS FOR A PARTICULAR PURPOSE. See the
+// 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