ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/info.C
(Generate patch)

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.51 by root, Fri Aug 29 02:07:10 2008 UTC vs.
Revision 1.57 by root, Fri Nov 6 13:11:28 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/** 25/**
… …
177 * client/server bandwidth (client could keep track of various strings 178 * client/server bandwidth (client could keep track of various strings
178 */ 179 */
179void 180void
180new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...) 181new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...)
181{ 182{
182 char buf[HUGE_BUF];
183
184 va_list ap; 183 va_list ap;
185 va_start (ap, format); 184 va_start (ap, format);
186 vsnprintf (buf, HUGE_BUF, format, ap); 185 new_draw_info (flags, pri, pl, vformat (format, ap));
187 va_end (ap); 186 va_end (ap);
188
189 new_draw_info (flags, pri, pl, buf);
190}
191
192void
193draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage)
194{
195
196 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
197 return;
198
199 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
200 {
201 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
202
203 if (buf == NULL)
204 LOG (llevError, "info::draw_ext_info -> Out of memory!");
205 else
206 {
207 strcpy (buf, oldmessage == NULL ? message : oldmessage);
208 strip_media_tag (buf);
209 new_draw_info (flags, pri, pl, buf);
210 free (buf);
211 }
212 }
213 else
214 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, message);
215}
216
217void
218draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
219{
220 char buf[HUGE_BUF];
221
222 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
223 return;
224
225 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
226 {
227 va_list ap;
228
229 LOG (llevDebug, "Non supported extension text type for client.\n");
230 va_start (ap, new_format);
231 vsnprintf (buf, HUGE_BUF, old_format, ap);
232 va_end (ap);
233 new_draw_info (flags, pri, pl, buf);
234 return;
235 }
236 else
237 {
238 va_list ap;
239
240 va_start (ap, new_format);
241 vsnprintf (buf, HUGE_BUF, new_format, ap);
242 va_end (ap);
243 strip_media_tag (buf);
244 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);
245 }
246} 187}
247 188
248/** 189/**
249 * Writes to everyone on the map *except* op. This is useful for emotions. 190 * Writes to everyone on the map *except* op. This is useful for emotions.
250 */ 191 */
251
252void 192void
253new_info_map_except (int color, maptile * map, object *op, const char *str) 193new_info_map_except (int color, maptile * map, object *op, const char *str)
254{ 194{
255 for_all_players (pl) 195 for_all_players (pl)
256 if (pl->ob->map == map && pl->ob != op) 196 if (pl->ob->map == map && pl->ob != op)
… …
258} 198}
259 199
260/** 200/**
261 * Writes to everyone on the map except op1 and op2 201 * Writes to everyone on the map except op1 and op2
262 */ 202 */
263void 203static void
264new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) 204new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
265{ 205{
266 for_all_players (pl) 206 for_all_players (pl)
267 if (pl->ob->map == map && pl->ob != op1 && pl->ob != op2) 207 if (pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
268 new_draw_info (color, 0, pl->ob, str); 208 new_draw_info (color, 0, pl->ob, str);
… …
292 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); 232 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title);
293} 233}
294 234
295// formerly a macro, used only by magic map, so optimised it out 235// formerly a macro, used only by magic map, so optimised it out
296static inline faceidx 236static inline faceidx
297GET_MAP_FACE (maptile *m, int x, int y, int layer) 237GET_MAP_FACE (mapspace &ms, int layer)
298{ 238{
299 if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer)) 239 if (object *op = ms.faces_obj [layer])
300 return op->face; 240 return op->face;
301 else 241 else
302 return 0; 242 return 0;
303} 243}
304 244
… …
314 * for various code values. 254 * for various code values.
315 */ 255 */
316static void 256static void
317magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) 257magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py)
318{ 258{
319 int x, y, dx, dy, mflags;
320 sint16 nx, ny;
321 maptile *mp;
322
323 for (dx = -1; dx <= 1; dx++) 259 for (int dx = -1; dx <= 1; dx++)
324 { 260 {
325 for (dy = -1; dy <= 1; dy++) 261 for (int dy = -1; dy <= 1; dy++)
326 { 262 {
327 x = px + dx; 263 int x = px + dx;
328 y = py + dy; 264 int y = py + dy;
329 265
330 if (FABS (x) >= MAGIC_MAP_HALF || FABS (y) >= MAGIC_MAP_HALF) 266 if (abs (x) >= MAGIC_MAP_HALF || abs (y) >= MAGIC_MAP_HALF)
331 continue; 267 continue;
332 268
333 mp = pl->map; 269 mapxy pos (pl);
334 nx = pl->x + x; 270 pos.move (x, y);
335 ny = pl->y + y;
336 271
337 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 272 if (!pos.normalise ())
338 if (mflags & P_OUT_OF_MAP)
339 continue; 273 continue;
274
275 mapspace &ms = pos.ms ();
340 276
341 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) 277 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
342 { 278 {
279 int mflags = ms.flags ();
280
343 int f = GET_MAP_FACE (mp, nx, ny, 0); 281 int f = GET_MAP_FACE (ms, 0);
344 if (f == blank_face) 282 if (f == blank_face)
345 { 283 {
346 f = GET_MAP_FACE (mp, nx, ny, 1); 284 f = GET_MAP_FACE (ms, 1);
347 if (f == blank_face) 285 if (f == blank_face)
348 f = GET_MAP_FACE (mp, nx, ny, 2); 286 f = GET_MAP_FACE (ms, 2);
349 } 287 }
350 288
351 int magicmap = faces [f].magicmap; 289 int magicmap = faces [f].magicmap;
352 290
353 /* Should probably have P_NO_MAGIC here also, but then shops don't 291 /* Should probably have P_NO_MAGIC here also, but then shops don't
… …
366} 304}
367 305
368/** 306/**
369 * Creates magic map for player. 307 * Creates magic map for player.
370 * 308 *
371 * Note: For improved magic mapping display, the space that blocks 309 * Note: For improved magic mapping display, the space that blocks
372 * the view is now marked with value 2. Any dependencies of map_mark 310 * the view is now marked with value 2. Any dependencies of map_mark
373 * being nonzero have been changed to check for 1. Also, since 311 * being nonzero have been changed to check for 1. Also, since
374 * map_mark is a char value, putting 2 in should cause no problems. 312 * map_mark is a char value, putting 2 in should cause no problems.
375 * 313 *
376 * This function examines the map the player is on, and determines what 314 * This function examines the map the player is on, and determines what
377 * is visible. 2 is set for walls or objects that blocks view. 1 315 * is visible. 2 is set for walls or objects that blocks view. 1
378 * is for open spaces. map_mark should already have been initialised 316 * is for open spaces. map_mark should already have been initialised
379 * to zero before this is called. 317 * to zero before this is called.
380 * strength is an initial strength*2 rectangular area that we automatically 318 * strength is an initial strength*2 rectangular area that we automatically
381 * see in/penetrate through. 319 * see in/penetrate through.
382 */ 320 */
383void 321static void
384magic_mapping_mark (object *pl, char *map_mark, int strength) 322magic_mapping_mark (object *pl, char *map_mark, int strength)
385{ 323{
386 int x, y, mflags;
387 sint16 nx, ny;
388 maptile *mp;
389
390 for (x = -strength; x < strength; x++) 324 for (int x = -strength; x < strength; x++)
391 { 325 {
392 for (y = -strength; y < strength; y++) 326 for (int y = -strength; y < strength; y++)
393 { 327 {
394 mp = pl->map; 328 mapxy pos (pl);
395 nx = pl->x + x; 329 pos.move (x, y);
396 ny = pl->y + y;
397 330
398 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 331 if (!pos.normalise ())
399 if (mflags & P_OUT_OF_MAP)
400 continue; 332 continue;
401 333
334 mapspace &ms = pos.ms ();
335
336 int mflags = ms.flags ();
337
402 int f = GET_MAP_FACE (mp, nx, ny, 0); 338 int f = GET_MAP_FACE (ms, 0);
403 if (f == blank_face) 339 if (f == blank_face)
404 { 340 {
405 f = GET_MAP_FACE (mp, nx, ny, 1); 341 f = GET_MAP_FACE (ms, 1);
406 if (f == blank_face) 342 if (f == blank_face)
407 f = GET_MAP_FACE (mp, nx, ny, 2); 343 f = GET_MAP_FACE (ms, 2);
408 } 344 }
409 345
410 int magicmap = faces [f].magicmap; 346 int magicmap = faces [f].magicmap;
411 347
412 if (mflags & P_BLOCKSVIEW) 348 if (mflags & P_BLOCKSVIEW)

Diff Legend

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