Changeset 24 for src/map/mob.c

Timestamp:

07/07/08 22:48:26 (17 years ago)

Author:

jinshiro

Message:

 

Files:

• src/map/mob.c (modified) (5 diffs)

src/map/mob.c

@@ -2026 +2026 @@
                         break;
                 //Let players decide whether to retaliate versus the master or the mob. [Skotlex]
-                /*if (md2->master_id && battle_config.retaliate_to_master)
-                        md->attacked_id = md2->master_id;*/
-                        if (md2->master_id && battle_config.retaliate_to_master)
-        {
-                //necro_retaliation config (same as above, but only works for adept/necro/warlock summons) [Brainstorm]
-                if(!battle_config.necro_retaliation && (md2->class_ >= 3100 && md2->class_ <= 3235))
-                md->attacked_id = src->id;
-                else md->attacked_id = md2->master_id; //All normal summons
-        }
+                if (md2->master_id && battle_config.retaliate_to_master)
+//this is odd... does that mean if you have a pet out it will get attecked instead of you?
+                {
+                        //necro_retaliation config (same as above, but only works for adept/necro/warlock summons) [Brainstorm]
+                        if(!battle_config.necro_retaliation && (md2->class_ >= 3100 && md2->class_ <= 3235))
+                                md->attacked_id = src->id;
+                        else md->attacked_id = md2->master_id; //All normal summons
+                }
 
                 else
@@ -2556 +2555 @@
                 mob_script_callback(md, src, CALLBACK_DEAD);
         else
-        if(md->npc_event[0] && !md->npc_killmonster)
+        if(md->npc_event[0] && !md->state.npc_killmonster)
         {
                 md->status.hp = 0; //So that npc_event invoked functions KNOW that I am dead.
@@ -2836 +2835 @@
 }
 
+//Weird structure, is this in the right place?
 /// Count slaves with a certain master and class. by FlavioJS [Brain]
 static int mob_countslave_class_sub(struct block_list* bl, va_list ap)
@@ -2851 +2851 @@
         if( md->master_id == id )
         {// has the correct master
-        int i;
-        for( i = 0; i < count; ++i )
-        {
-                if( md->class_ == classes[i] )
-                return 1;
-        }
+                int i;
+                for( i = 0; i < count; ++i )
+                {
+                        if( md->class_ == classes[i] )
+                                return 1;
+                }
         }
         return 0;
@@ -4033 +4033 @@
                 "mob_boss.txt",
                 "mob_pouch.txt",
-                "mob_familiar.txt"
-        };
+                "mob_familiar.txt" // familiar By FlavioJS [Brain]
+                };//mob_familiar.txt make sure the name is right.
 
         memset(&summon, 0, sizeof(summon));