diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/clif.c | 6 | ||||
| -rw-r--r-- | src/map/map.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index ebc065bde..6b9f2d71b 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -1578,7 +1578,7 @@ static int clif_pet0078(struct pet_data *pd, unsigned char *buf) { WBUFW(buf,6)=pd->speed;
WBUFW(buf,14)=view_class;
WBUFW(buf,16)=battle_config.pet_hair_style;
- if((view_class = itemdb_viewid(pd->equip)) > 0)
+ if(pd->equip && (view_class = itemdb_viewid(pd->equip)) > 0)
WBUFW(buf,20)=view_class;
else
WBUFW(buf,20)=pd->equip;
@@ -1680,7 +1680,7 @@ static int clif_pet007b(struct pet_data *pd, unsigned char *buf) { WBUFW(buf,6)=pd->speed;
WBUFW(buf,14)=view_class;
WBUFW(buf,16)=battle_config.pet_hair_style;
- if ((view_class = itemdb_viewid(pd->equip)) > 0)
+ if (pd->equip && (view_class = itemdb_viewid(pd->equip)) > 0)
WBUFW(buf,20)=view_class;
else
WBUFW(buf,20)=pd->equip;
@@ -6958,7 +6958,7 @@ int clif_pet_equip(struct pet_data *pd,int nameid) WBUFW(buf,0)=0x1a4;
WBUFB(buf,2)=3;
WBUFL(buf,3)=pd->bl.id;
- if((view = itemdb_viewid(nameid)) > 0)
+ if(nameid && (view = itemdb_viewid(nameid)) > 0)
WBUFL(buf,7)=view;
else
WBUFL(buf,7)=nameid;
diff --git a/src/map/map.h b/src/map/map.h index da04f6d0b..70c6b4ec1 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -1139,7 +1139,6 @@ typedef enum { CELL_CHKNOPASS, // 通過不可(セルタイプ1,5)
CELL_GETTYPE, // セルタイプを返す
CELL_GETCELLTYPE,
- CELL_CHKSTACK,
CELL_CHKNPC=0x10, // タッチタイプのNPC(セルタイプ0x80フラグ)
CELL_CHKREGEN, // cells that improve regeneration
CELL_CHKPNEUMA,
@@ -1148,6 +1147,7 @@ typedef enum { CELL_CHKLANDPROTECTOR,
CELL_CHKMOONLIT,
CELL_CHKICEWALL,
+ CELL_CHKSTACK,
} cell_t;
// map_setcell()で使用されるフラグ
enum {
|