|
@@ -2824,12 +2824,14 @@ static const char* npc_parse_shop(char* w1, char* w2, char* w3, char* w4, const
|
|
map_addnpc(m,nd);
|
|
map_addnpc(m,nd);
|
|
if(map_addblock(&nd->bl))
|
|
if(map_addblock(&nd->bl))
|
|
return strchr(start,'\n');
|
|
return strchr(start,'\n');
|
|
- status_set_viewdata(&nd->bl, nd->class_);
|
|
|
|
status_change_init(&nd->bl);
|
|
status_change_init(&nd->bl);
|
|
unit_dataset(&nd->bl);
|
|
unit_dataset(&nd->bl);
|
|
nd->ud.dir = (uint8)dir;
|
|
nd->ud.dir = (uint8)dir;
|
|
- if( map[nd->bl.m].users )
|
|
|
|
- clif_spawn(&nd->bl);
|
|
|
|
|
|
+ if( nd->class_ != JT_FAKENPC ){
|
|
|
|
+ status_set_viewdata(&nd->bl, nd->class_);
|
|
|
|
+ if( map[nd->bl.m].users )
|
|
|
|
+ clif_spawn(&nd->bl);
|
|
|
|
+ }
|
|
} else
|
|
} else
|
|
{// 'floating' shop?
|
|
{// 'floating' shop?
|
|
map_addiddb(&nd->bl);
|
|
map_addiddb(&nd->bl);
|
|
@@ -3059,7 +3061,7 @@ static const char* npc_parse_script(char* w1, char* w2, char* w3, char* w4, cons
|
|
npc_setcells(nd);
|
|
npc_setcells(nd);
|
|
if(map_addblock(&nd->bl))
|
|
if(map_addblock(&nd->bl))
|
|
return NULL;
|
|
return NULL;
|
|
- if( nd->class_ >= 0 )
|
|
|
|
|
|
+ if( nd->class_ != JT_FAKENPC )
|
|
{
|
|
{
|
|
status_set_viewdata(&nd->bl, nd->class_);
|
|
status_set_viewdata(&nd->bl, nd->class_);
|
|
if( map[nd->bl.m].users )
|
|
if( map[nd->bl.m].users )
|
|
@@ -3217,7 +3219,7 @@ const char* npc_parse_duplicate(char* w1, char* w2, char* w3, char* w4, const ch
|
|
npc_setcells(nd);
|
|
npc_setcells(nd);
|
|
if(map_addblock(&nd->bl))
|
|
if(map_addblock(&nd->bl))
|
|
return end;
|
|
return end;
|
|
- if( nd->class_ >= 0 ) {
|
|
|
|
|
|
+ if( nd->class_ != JT_FAKENPC ) {
|
|
status_set_viewdata(&nd->bl, nd->class_);
|
|
status_set_viewdata(&nd->bl, nd->class_);
|
|
if( map[nd->bl.m].users )
|
|
if( map[nd->bl.m].users )
|
|
clif_spawn(&nd->bl);
|
|
clif_spawn(&nd->bl);
|