From 9d51b2e1077042ae42d42a0e6314e439c62e2925 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Wed, 21 Mar 2007 02:05:37 +0000 Subject: Avoiding magic numbers where possible (1002) and also display the target when other players are targeted. --- src/resources/monsterdb.h | 90 ++++++++++++------------- src/resources/monsterinfo.h | 158 +++++++++++++++++++++++--------------------- 2 files changed, 129 insertions(+), 119 deletions(-) (limited to 'src/resources') diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h index b105665a..9757d7f1 100644 --- a/src/resources/monsterdb.h +++ b/src/resources/monsterdb.h @@ -1,45 +1,45 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World 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 2 of the License, or - * any later version. - * - * The Mana World 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 The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: - */ - -#ifndef _TMW_MONSTER_DB_H -#define _TMW_MONSTER_DB_H - -#include - -#include "monsterinfo.h" - -namespace MonsterDB -{ - void - load(); - - void - unload(); - - const MonsterInfo& get (int id); - - typedef std::map MonsterInfos; - typedef MonsterInfos::iterator MonsterInfoIterator; -} - -#endif +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World 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 2 of the License, or + * any later version. + * + * The Mana World 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 The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id: + */ + +#ifndef _TMW_MONSTER_DB_H +#define _TMW_MONSTER_DB_H + +#include + +#include "monsterinfo.h" + +namespace MonsterDB +{ + void + load(); + + void + unload(); + + const MonsterInfo& get(int id); + + typedef std::map MonsterInfos; + typedef MonsterInfos::iterator MonsterInfoIterator; +} + +#endif diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h index 413dafa0..b65237da 100644 --- a/src/resources/monsterinfo.h +++ b/src/resources/monsterinfo.h @@ -1,74 +1,84 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World 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 2 of the License, or - * any later version. - * - * The Mana World 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 The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: monsterinfo.h 2650 2006-09-03 15:00:47Z b_lindeijer $ - */ - -#ifndef _TMW_MONSTERINFO_H_ -#define _TMW_MONSTERINFO_H_ - -#include -#include -#include - - -enum SoundEvent -{ - EVENT_HIT, - EVENT_MISS, - EVENT_HURT, - EVENT_DIE -}; - - -class MonsterInfo -{ - public: - MonsterInfo(); - - ~MonsterInfo(); - - void - setName(std::string name) { mName = name; } ; - - void - setSprite(std::string filename) { mSprite = filename; } - - void - addSound (SoundEvent event, std::string filename); - - const std::string& - getName () const { return mName; }; - - const std::string& - getSprite () const { return mSprite; }; - - std::string - getSound (SoundEvent event) const; - - private: - - std::string mName; - std::string mSprite; - - std::map* > mSounds; -}; - -#endif +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World 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 2 of the License, or + * any later version. + * + * The Mana World 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 The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id: monsterinfo.h 2650 2006-09-03 15:00:47Z b_lindeijer $ + */ + +#ifndef _TMW_MONSTERINFO_H_ +#define _TMW_MONSTERINFO_H_ + +#include +#include +#include + + +enum SoundEvent +{ + EVENT_HIT, + EVENT_MISS, + EVENT_HURT, + EVENT_DIE +}; + +/** + * Holds information about a certain type of monster. This includes the name + * of the monster, the sprite to display and the sounds the monster makes. + * + * @see MonsterDB + */ +class MonsterInfo +{ + public: + /** + * Constructor. + */ + MonsterInfo(); + + /** + * Destructor. + */ + ~MonsterInfo(); + + void + setName(std::string name) { mName = name; } + + void + setSprite(std::string filename) { mSprite = filename; } + + void + addSound(SoundEvent event, std::string filename); + + const std::string& + getName() const { return mName; } + + const std::string& + getSprite() const { return mSprite; } + + std::string + getSound(SoundEvent event) const; + + private: + std::string mName; + std::string mSprite; + + std::map* > mSounds; +}; + +#endif -- cgit v1.2.3-70-g09d2