Changeset 19 for src/map/mob.c

Timestamp:

07/02/08 12:20:18 (17 years ago)

Author:

jinshiro

Message:

Now Compiles with Cygwin GCC

Files:

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

src/map/mob.c

@@ -548 +548 @@
         barricade->amount = 0;
         barricade->killable = killable;
-        barricade->shootable = shootable;
-        barricade->walkable = walkable;
+        
+        // A protection just in case setting a walkable - non shootable
+        if( (barricade->walkable = walkable) == true )
+                barricade->shootable = true;
+        else
+                barricade->shootable = shootable;
         
         for( i = 0; i < count; i++ )
@@ -570 +574 @@
                 }
 
-                if( !barricade->walkable ) map_setcell(m, x1, y1, CELL_WALKABLE, false);
-                map_setcell(m, x1, y1, CELL_SHOOTABLE, barricade->shootable);
+                if( !barricade->walkable )
+                {
+                        map_setcell(m, x1, y1, CELL_WALKABLE, false);
+                        map_setcell(m, x1, y1, CELL_SHOOTABLE, barricade->shootable);
+                }
 
                 clif_changemapcell(0, m, x1, y1, map_getcell(barricade->m, x1, y1, CELL_GETTYPE), ALL_SAMEMAP);
@@ -626 +633 @@
                 mob_barricade_nextxy(barricade->x, barricade->y, barricade->dir, i, &x1, &y1);
 
-                if( !barricade->walkable ) map_setcell(barricade->m, x1, y1, CELL_WALKABLE, true);
-                map_setcell(barricade->m, x1, y1, CELL_SHOOTABLE, !barricade->shootable);
+                if( !barricade->shootable )
+                        map_setcell(barricade->m, x1, y1, CELL_SHOOTABLE, true);
+                if( !barricade->walkable )
+                        map_setcell(barricade->m, x1, y1, CELL_WALKABLE, true);
+
                 clif_changemapcell(0, barricade->m, x1, y1, map_getcell(barricade->m, x1, y1, CELL_GETTYPE), ALL_SAMEMAP);
         }
@@ -688 +698 @@
                         mob_barricade_nextxy(barricade->x, barricade->y, barricade->dir, i, &x1, &y1);
 
-                        if( !barricade->walkable ) map_setcell(barricade->m, x1, y1, CELL_WALKABLE, true);
-                        map_setcell(barricade->m, x1, y1, CELL_SHOOTABLE, !barricade->shootable);
+                        if( !barricade->shootable )
+                                map_setcell(barricade->m, x1, y1, CELL_SHOOTABLE, true);
+                        if( !barricade->walkable )
+                                map_setcell(barricade->m, x1, y1, CELL_WALKABLE, true);
+
                         clif_changemapcell(0, barricade->m, x1, y1, map_getcell(barricade->m, x1, y1, CELL_GETTYPE), ALL_SAMEMAP);
                 }
@@ -2015 +2028 @@
                 /*if (md2->master_id && battle_config.retaliate_to_master)
                         md->attacked_id = md2->master_id;*/
-//UNCOMMENT IF ERROR OCCURS WITH CUSTOM JOBS V
-//if (md2->master_id && battle_config.retaliate_to_master)
-                //BEGIN Custom Jobs (blackmagic)
-                        {
+                        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))
@@ -2024 +2035 @@
                 else md->attacked_id = md2->master_id; //All normal summons
         }
-                        //end
+
                 else
                         md->attacked_id = src->id;
@@ -2825 +2836 @@
 }
 
-//Begin Custom Jobs (blackmagic)
 /// Count slaves with a certain master and class. by FlavioJS [Brain]
 static int mob_countslave_class_sub(struct block_list* bl, va_list ap)
@@ -2860 +2870 @@
 }
 
-//End
 
 /*==========================================
@@ -4023 +4032 @@
                 "mob_poring.txt",
                 "mob_boss.txt",
-                "mob_pouch.txt"
-                //Begin custom Jobs (blackmagic
-                "mob_familiar.txt" // familiar By FlavioJS [Brain]
+                "mob_pouch.txt",
+                "mob_familiar.txt"
         };
-        //end
 
         memset(&summon, 0, sizeof(summon));