Changeset 23 for src/map/npc.c

Timestamp:

07/03/08 02:59:16 (17 years ago)

Author:

jinshiro

Message:

Temporarilly resolved problems with logging in. Changed familliar db to fix crash issue.

Files:

• src/map/npc.c (modified) (6 diffs)

src/map/npc.c

@@ -783 +783 @@
 int npc_touch_areanpc2(struct mob_data *md)
 {
-        int i, m = md->bl.m, x = md->bl.x, y = md->bl.y;
+        int i, m = md->bl.m, x = md->bl.x, y = md->bl.y, id;
         char eventname[NAME_LENGTH*2+3];
         struct event_data* ev;
@@ -827 +827 @@
                                                 break; // No OnTouchNPC Event
                                         md->areanpc_id = map[m].npc[i]->bl.id;
+                                        id = md->bl.id; // Stores Unique ID
                                         run_script(ev->nd->u.scr.script, ev->pos, md->bl.id, ev->nd->bl.id);
+                                        if( map_id2md(id) == NULL ) return 1; // Not Warped, but killed
                                         break;
                         }
@@ -2062 +2064 @@
         switch(nd->subtype)
         {
-                case WARP:
-                        xs = nd->u.warp.xs;
-                        ys = nd->u.warp.ys;
-                        break;
-                case SCRIPT:
-                        xs = nd->u.scr.xs;
-                        ys = nd->u.scr.ys;
-                        break;
-                default:
-                        return; // Other types doesn't have touch area
+        case WARP:
+                xs = nd->u.warp.xs;
+                ys = nd->u.warp.ys;
+                break;
+        case SCRIPT:
+                xs = nd->u.scr.xs;
+                ys = nd->u.scr.ys;
+                break;
+        default:
+                return; // Other types doesn't have touch area
         }
 
@@ -2625 +2627 @@
         else if (!strcmpi(w3,"guildlock"))
                 map[m].flag.guildlock=state;
-        else if (!strcmpi(w3,"hostile"))
-        map[m].flag.hostile=state;//Sketchy
         else
                 ShowError("npc_parse_mapflag: unrecognized mapflag '%s' (file '%s', line '%d').\n", w3, filepath, strline(buffer,start-buffer));
@@ -2900 +2900 @@
                 "\t-'"CL_WHITE"%d"CL_RESET"' Shops\n"
                 "\t-'"CL_WHITE"%d"CL_RESET"' Scripts\n"
-                "\t-'"CL_WHITE"%d"CL_RESET"' Mob sets\n"
+                "\t-'"CL_WHITE"%d"CL_RESET"' Spawn sets\n"
                 "\t-'"CL_WHITE"%d"CL_RESET"' Mobs Cached\n"
                 "\t-'"CL_WHITE"%d"CL_RESET"' Mobs Not Cached\n",
@@ -3011 +3011 @@
                 "\t-'"CL_WHITE"%d"CL_RESET"' Shops\n"
                 "\t-'"CL_WHITE"%d"CL_RESET"' Scripts\n"
-                "\t-'"CL_WHITE"%d"CL_RESET"' Mob sets\n"
+                "\t-'"CL_WHITE"%d"CL_RESET"' Spawn sets\n"
                 "\t-'"CL_WHITE"%d"CL_RESET"' Mobs Cached\n"
                 "\t-'"CL_WHITE"%d"CL_RESET"' Mobs Not Cached\n",