--- deliantra/server/include/player.h 2008/09/25 04:09:57 1.83 +++ deliantra/server/include/player.h 2008/12/19 22:47:29 1.85 @@ -166,9 +166,26 @@ /* Special DM fields */ tag_t *stack_items; /* Item stack for patch/dump/... commands */ int ACC (RW, stack_position); /* Current stack position, 0 for no item */ - sint8 blocked_los[MAP_CLIENT_X][MAP_CLIENT_Y]; /* array showing what spaces */ - /* the player can see. For maps smaller than */ - /* MAP_CLIENT_.., the upper left is used */ + sint8 los[MAP_CLIENT_X][MAP_CLIENT_Y]; /* array showing what spaces */ + /* the player can see. For maps smaller than */ + /* MAP_CLIENT_.., the center is used */ + + // return the los value for the given coordinate + MTH sint8 blocked_los (int dx, int dy) const + { + dx += LOS_X0; + dy += LOS_Y0; + + return 0 <= dx && dx < MAP_CLIENT_X + && 0 <= dy && dy < MAP_CLIENT_Y + ? los[dx][dy] : LOS_BLOCKED; + } + + // unchecked variant + sint8 blocked_los_uc (int dx, int dy) const + { + return los[dx + LOS_X0][dy + LOS_Y0]; + } shstr ACC (RW, invis_race); /* What race invisible to? */ @@ -181,6 +198,8 @@ MTH static player *load_pl (object_thawer *thawer) { return load_pl (*thawer); } MTH void link_skills (); + MTH object *find_skill (const char *name) const; + object *find_skill (const shstr &name) const; bool save_pl (object_freezer &freezer); MTH bool save_pl (const char *path);