diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-10-23 08:02:22 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-10-23 08:02:22 +0000 |
| commit | 8eda6c18fd391e34f180aaece96140a374f274f9 (patch) | |
| tree | 9598ebf5280790951b30befe9c84d4bba57198e4 /src/resources/iteminfo.h | |
| parent | c9f618b5c50f759cf172d8e37063ef56e05812cf (diff) | |
| download | mana-8eda6c18fd391e34f180aaece96140a374f274f9.tar.gz mana-8eda6c18fd391e34f180aaece96140a374f274f9.tar.bz2 mana-8eda6c18fd391e34f180aaece96140a374f274f9.tar.xz mana-8eda6c18fd391e34f180aaece96140a374f274f9.zip | |
Merged changesets 3653, 3655-3657, 3659-3560, 3671-3672 from trunk to
0.0. Mostly memory leak fixes by Guillaume.
Diffstat (limited to 'src/resources/iteminfo.h')
| -rw-r--r-- | src/resources/iteminfo.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 457daf7f..b016f27b 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -49,7 +49,6 @@ class ItemInfo * Constructor. */ ItemInfo(): - mImageName(""), mImage(NULL), mType(0), mWeight(0), @@ -138,7 +137,7 @@ class ItemInfo std::map<int, std::string> mAnimationFiles; /** Stores the names of sounds to be played at certain event. */ - std::map<EquipmentSoundEvent, std::vector<std::string>* > mSounds; + std::map< EquipmentSoundEvent, std::vector<std::string> > mSounds; }; #endif |