diff options
| author | MadCamel <madcamel@gmail.com> | 2009-09-30 13:53:33 -0400 |
|---|---|---|
| committer | MadCamel <madcamel@gmail.com> | 2009-09-30 13:53:33 -0400 |
| commit | 3fc3d83aa0be31e6d51afac54ff76b447f99f711 (patch) | |
| tree | 2deac15b3e34382f11a27090e3f1a8ef3049618b /src/map/map.h | |
| parent | 5967577d8bf92a9912cd153b20597f0d13a19456 (diff) | |
| parent | 48d96bc41a4791b6cb0bc2cf514a6cc1f06c4dd8 (diff) | |
| download | tmwa-3fc3d83aa0be31e6d51afac54ff76b447f99f711.tar.gz tmwa-3fc3d83aa0be31e6d51afac54ff76b447f99f711.tar.bz2 tmwa-3fc3d83aa0be31e6d51afac54ff76b447f99f711.tar.xz tmwa-3fc3d83aa0be31e6d51afac54ff76b447f99f711.zip | |
Merge branch 'master' of git://gitorious.org/tmw-eathena/mainline
Diffstat (limited to 'src/map/map.h')
| -rw-r--r-- | src/map/map.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/map/map.h b/src/map/map.h index 5e77d89..9a6b3ef 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -546,6 +546,7 @@ struct map_data { unsigned sakura : 1; // [Valaris] unsigned leaves : 1; // [Valaris] unsigned rain : 1; // [Valaris] + unsigned no_player_drops : 1; // [Jaxad0127] } flag; struct point save; struct npc_data *npc[MAX_NPC_PER_MAP]; @@ -630,6 +631,11 @@ enum { LOOK_MISC2 }; +enum { + EQUIP_SHIELD = 8, + EQUIP_WEAPON = 9 +}; + #define LOOK_LAST LOOK_MISC2 struct chat_data { @@ -692,6 +698,9 @@ extern FILE *map_logfile; void map_write_log(char *format, ...); #define MAP_LOG(format, args...) {if (map_logfile) map_write_log(format, ##args);} +#define MAP_LOG_PC(sd, fmt, args...) MAP_LOG("PC%d %d:%d,%d " fmt, sd->status.char_id, sd->bl.m, sd->bl.x, sd->bl.y, ## args) + + // 床アイテム関連 int map_clearflooritem_timer(int,unsigned int,int,int); #define map_clearflooritem(id) map_clearflooritem_timer(0,0,id,1) |