diff options
| author | Fate <fate-tmw@googlemail.com> | 2008-12-06 20:02:33 -0700 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2008-12-06 20:02:33 -0700 |
| commit | 28fa707f1ab22e7cac8abff703d534aec3228d5c (patch) | |
| tree | bc0d906aa6d414b867eda5df02520b5f707216f1 /src/resources/itemdb.cpp | |
| parent | 704f58c9033599c871c176df68ffe7ac3bc8c969 (diff) | |
| parent | 7b11d719316e84d97e95a32de2a74803aa18e5da (diff) | |
| download | mana-28fa707f1ab22e7cac8abff703d534aec3228d5c.tar.gz mana-28fa707f1ab22e7cac8abff703d534aec3228d5c.tar.bz2 mana-28fa707f1ab22e7cac8abff703d534aec3228d5c.tar.xz mana-28fa707f1ab22e7cac8abff703d534aec3228d5c.zip | |
Merge branch 'master' into statuseffects
Diffstat (limited to 'src/resources/itemdb.cpp')
| -rw-r--r-- | src/resources/itemdb.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 5ee40014..e6f2fd1f 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -125,10 +125,10 @@ void ItemDB::load() CHECK_PARAM(name, ""); CHECK_PARAM(image, ""); - // CHECK_PARAM(description, ""); - // CHECK_PARAM(effect, ""); + CHECK_PARAM(description, ""); + CHECK_PARAM(effect, ""); // CHECK_PARAM(type, 0); - CHECK_PARAM(weight, 0); + // CHECK_PARAM(weight, 0); // CHECK_PARAM(slot, 0); #undef CHECK_PARAM |