Fixed initialization order and added setup_keyboard.* and keyboardconfig.* to

the list of source files. Also set some missing Subversion properties.

1 files changed, 77 insertions, 76 deletions

diff --git a/src/resources/equipmentinfo.h b/src/resources/equipmentinfo.h
index 5cd0643b..d9439c50 100644
--- a/src/resources/equipmentinfo.h
+++ b/src/resources/equipmentinfo.h
@@ -1,76 +1,77 @@
-/*

- *  The Mana World

- *  Copyright 2006 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_EQUIPMENTINFO_H_

-#define _TMW_EQUIPMENTINFO_H_

-

-#include <map>

-#include <string>

-#include <vector>

-

-#include "spritedef.h"

-

-enum EquipmentSoundEvent

-{

-    EQUIP_EVENT_STRIKE,

-    EQUIP_EVENT_HIT

-};

-

-class EquipmentInfo

-{

-    public:

-        EquipmentInfo():

-            mSlot (0),

-            mAttackType(ACTION_DEFAULT)

-        {

-        };

-

-        void

-        setSlot (int slot) { mSlot = slot; }

-

-        const std::string&

-        getSprite(int gender) {return animationFiles[gender]; }

-

-        void

-        setSprite(std::string animationFile, int gender) {animationFiles[gender] = animationFile; }

-

-        void

-        setAttackType(std::string attackType);

-

-        const SpriteAction

-        getAttackType() { return mAttackType; }

-

-        void

-        addSound(EquipmentSoundEvent event, std::string filename);

-

-        std::string

-        getSound(EquipmentSoundEvent event) const;

-

-    private:

-        int mSlot;   //not used at the moment but maybe useful on our own server

-        SpriteAction mAttackType;

-        std::map<int, std::string> animationFiles;

-        std::map<EquipmentSoundEvent, std::vector<std::string>* > mSounds;

-};

-

-#endif

+/*
+ *  The Mana World
+ *  Copyright 2006 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_EQUIPMENTINFO_H_
+#define _TMW_EQUIPMENTINFO_H_
+
+#include <map>
+#include <string>
+#include <vector>
+
+#include "spritedef.h"
+
+enum EquipmentSoundEvent
+{
+    EQUIP_EVENT_STRIKE,
+    EQUIP_EVENT_HIT
+};
+
+class EquipmentInfo
+{
+    public:
+        EquipmentInfo():
+            mSlot (0),
+            mAttackType(ACTION_DEFAULT)
+        {
+        }
+
+        void
+        setSlot (int slot) { mSlot = slot; }
+
+        const std::string&
+        getSprite(int gender) { return animationFiles[gender]; }
+
+        void
+        setSprite(const std::string &animationFile, int gender)
+        { animationFiles[gender] = animationFile; }
+
+        void
+        setAttackType(std::string attackType);
+
+        const SpriteAction
+        getAttackType() { return mAttackType; }
+
+        void
+        addSound(EquipmentSoundEvent event, std::string filename);
+
+        std::string
+        getSound(EquipmentSoundEvent event) const;
+
+    private:
+        int mSlot;   //not used at the moment but maybe useful on our own server
+        SpriteAction mAttackType;
+        std::map<int, std::string> animationFiles;
+        std::map<EquipmentSoundEvent, std::vector<std::string>* > mSounds;
+};
+
+#endif