From c67c2b7435a13d7ce17b2075e22dc5c6036f702a Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Mon, 4 Feb 2013 00:49:50 -0800
Subject: Remove some more Skill-related stuff

---
 src/map/mob.hpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/map/mob.hpp')

diff --git a/src/map/mob.hpp b/src/map/mob.hpp
index 8247102..2d51eb0 100644
--- a/src/map/mob.hpp
+++ b/src/map/mob.hpp
@@ -13,17 +13,16 @@
 
 struct mob_skill
 {
-    MSS state;
+    MobSkillState state;
     SkillID skill_id;
     short skill_lv;
     short permillage;
     int casttime, delay;
     short cancel;
-    MSC cond1;
+    MobSkillCondition cond1;
     int cond2i;
-    StatusChange cond2sc() { return StatusChange(cond2i); }
     SkillID cond2sk() { return SkillID(cond2i); }
-    MST target;
+    MobSkillTarget target;
     int val[5];
     short emotion;
 };
@@ -38,7 +37,10 @@ struct mob_db
     int def, mdef;
     earray<int, ATTR, ATTR::COUNT> attrs;
     int range, range2, range3;
-    int size, race, element;
+    // always 1
+    int size;
+    Race race;
+    LevelElement element;
     MobMode mode;
     int speed, adelay, amotion, dmotion;
     int mexp, mexpper;
@@ -106,7 +108,7 @@ int mob_class_change(struct mob_data *md, int *value);
 int mob_warp(struct mob_data *md, int m, int x, int y, int type);
 
 int mobskill_use(struct mob_data *md, unsigned int tick,
-        MSC event, SkillID skill=SkillID::ZERO);
+        MobSkillCondition event, SkillID skill=SkillID::ZERO);
 int mobskill_event(struct mob_data *md, BF flag);
 void mobskill_castend_id(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data);
 void mobskill_castend_pos(timer_id tid, tick_t tick, custom_id_t id, custom_data_t data);
-- 
cgit v1.2.3-60-g2f50