ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/player.h
(Generate patch)

Comparing deliantra/server/include/player.h (file contents):
Revision 1.83 by root, Thu Sep 25 04:09:57 2008 UTC vs.
Revision 1.87 by root, Tue Dec 23 00:39:48 2008 UTC

… …
164 uint16 ACC (RW, outputs_count); /* Print if this count is exceeded */ 164 uint16 ACC (RW, outputs_count); /* Print if this count is exceeded */
165 object_ptr ACC (RW, mark); /* marked object */ 165 object_ptr ACC (RW, mark); /* marked object */
166 /* Special DM fields */ 166 /* Special DM fields */
167 tag_t *stack_items; /* Item stack for patch/dump/... commands */ 167 tag_t *stack_items; /* Item stack for patch/dump/... commands */
168 int ACC (RW, stack_position); /* Current stack position, 0 for no item */ 168 int ACC (RW, stack_position); /* Current stack position, 0 for no item */
169 sint8 blocked_los[MAP_CLIENT_X][MAP_CLIENT_Y]; /* array showing what spaces */ 169 sint8 los[MAP_CLIENT_X][MAP_CLIENT_Y]; /* array showing what spaces */
170 /* the player can see. For maps smaller than */ 170 /* the player can see. For maps smaller than */
171 /* MAP_CLIENT_.., the upper left is used */ 171 /* MAP_CLIENT_.., the center is used */
172
173 // return the los value for the given coordinate
174 MTH sint8 blocked_los (int dx, int dy) const
175 {
176 dx += LOS_X0;
177 dy += LOS_Y0;
178
179 return 0 <= dx && dx < MAP_CLIENT_X
180 && 0 <= dy && dy < MAP_CLIENT_Y
181 ? los[dx][dy] : LOS_BLOCKED;
182 }
183
184 // unchecked variant
185 sint8 blocked_los_uc (int dx, int dy) const
186 {
187 return los[dx + LOS_X0][dy + LOS_Y0];
188 }
189
190 MTH void clear_los (sint8 value = LOS_BLOCKED);
172 191
173 shstr ACC (RW, invis_race); /* What race invisible to? */ 192 shstr ACC (RW, invis_race); /* What race invisible to? */
174 193
175 MTH const char *killer_name () const; // makes a string out of ->killer 194 MTH const char *killer_name () const; // makes a string out of ->killer
176 195
… …
179 198
180 static player *load_pl (object_thawer &thawer); 199 static player *load_pl (object_thawer &thawer);
181 MTH static player *load_pl (object_thawer *thawer) { return load_pl (*thawer); } 200 MTH static player *load_pl (object_thawer *thawer) { return load_pl (*thawer); }
182 201
183 MTH void link_skills (); 202 MTH void link_skills ();
203 MTH object *find_skill (const char *name) const;
204 object *find_skill (const shstr &name) const;
184 205
185 bool save_pl (object_freezer &freezer); 206 bool save_pl (object_freezer &freezer);
186 MTH bool save_pl (const char *path); 207 MTH bool save_pl (const char *path);
187 208
188 void do_destroy (); 209 void do_destroy ();
… …
245 266
246#define for_all_players(var) \ 267#define for_all_players(var) \
247 for (unsigned _i = 0; _i < ::players.size (); ++_i) \ 268 for (unsigned _i = 0; _i < ::players.size (); ++_i) \
248 statementvar (player *, var, ::players [_i]) 269 statementvar (player *, var, ::players [_i])
249 270
271#define for_all_players_on_map(var,mapp) \
272 for_all_players(var) \
273 if ((var)->ob->map == (mapp))
274
250inline void 275inline void
251object::statusmsg (const char *msg, int color) 276object::statusmsg (const char *msg, int color)
252{ 277{
253 if (expect_true (contr)) contr->statusmsg (msg, color); 278 if (expect_true (contr)) contr->statusmsg (msg, color);
254} 279}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines