diff options
| author | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-18 11:40:36 +0000 |
|---|---|---|
| committer | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-18 11:40:36 +0000 |
| commit | a899340d9059d43fd850d161136582998e8bc07e (patch) | |
| tree | 16614b89f4e156153de58761e6bf0bcb0beaae15 /src/map/npc.c | |
| parent | ff21eb94130750acfe899b97b06a1fbe9e6790ef (diff) | |
| download | hercules-a899340d9059d43fd850d161136582998e8bc07e.tar.gz hercules-a899340d9059d43fd850d161136582998e8bc07e.tar.bz2 hercules-a899340d9059d43fd850d161136582998e8bc07e.tar.xz hercules-a899340d9059d43fd850d161136582998e8bc07e.zip | |
* Shinomori's method (kinda) of remote script execution with interaction.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6151 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index f09a4a367..092dda2ad 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -985,6 +985,9 @@ int npc_checknear(struct map_session_data *sd,int id) nullpo_retr(0, sd);
+ if(sd->state.using_fake_npc)
+ return 0;
+
nd=(struct npc_data *)map_id2bl(id);
if (nd==NULL || nd->bl.type!=BL_NPC) {
if (battle_config.error_log)
@@ -992,8 +995,8 @@ int npc_checknear(struct map_session_data *sd,int id) return 1;
}
- if (nd->class_<0) // イベント系は常にOK
- return 0;
+ //if (nd->class_<0) // イベント系は常にOK
+ // return 0;
// エリア判定
if (nd->bl.m!=sd->bl.m ||
@@ -2783,6 +2786,9 @@ int do_init_npc(void) add_timer_func_list(npc_event_do_clock,"npc_event_do_clock");
add_timer_func_list(npc_timerevent,"npc_timerevent");
+ // Init dummy NPC
+ dummy_npc_id = npc_get_new_npc_id();
+
return 0;
}
// [Lance]
|