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.6 by root, Thu Sep 14 22:34:05 2006 UTC vs.
Revision 1.35 by root, Sun Mar 11 02:12:45 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24/** 25/**
25 * \file 26 * \file
26 * Basic client output functions. 27 * Basic client output functions.
27 * 28 *
… …
42 * much the same thing as the draw_info above, but takes a color 43 * much the same thing as the draw_info above, but takes a color
43 * parameter. the esrv_drawinfo functions should probably be 44 * parameter. the esrv_drawinfo functions should probably be
44 * replaced with this, just using black as the color. 45 * replaced with this, just using black as the color.
45 */ 46 */
46static void 47static void
47esrv_print_msg (NewSocket * ns, int color, const char *str) 48esrv_print_msg (client *ns, int color, const char *str)
48{ 49{
49 char buf[HUGE_BUF]; 50 ns->send_packet_printf ("drawinfo %d %s", color, str);
50
51 if (ns->status == Ns_Old)
52 {
53 snprintf (buf, HUGE_BUF, "%s\n", str);
54 }
55 else
56 {
57 snprintf (buf, HUGE_BUF, "drawinfo %d %s", color, str);
58 }
59
60/* LOG(llevDebug,"sending %s to socket, len=%d\n", buf, strlen(buf));*/
61 Write_String_To_Socket (ns, buf, strlen (buf));
62} 51}
63 52
64/** 53/**
65 * Draws an extended message on the client. 54 * Draws an extended message on the client.
66 * ns the socket to send message to 55 * ns the socket to send message to
… …
69 * subtype type and subtype of text message 58 * subtype type and subtype of text message
70 * intro Intro message to send with main message if client does not support the message type 59 * intro Intro message to send with main message if client does not support the message type
71 * message The main message 60 * message The main message
72 */ 61 */
73static void 62static void
74esrv_print_ext_msg (NewSocket * ns, int color, uint8 type, uint8 subtype, const char *message) 63esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message)
75{ 64{
76 char buf[HUGE_BUF];
77
78 snprintf (buf, HUGE_BUF, "drawextinfo %d %hhu %hhu %s", color, type, subtype, message); 65 ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message);
79 Write_String_To_Socket (ns, buf, strlen (buf));
80
81/* LOG(llevDebug,"sending %s to socket, len=%d", buf, strlen(buf));*/
82
83} 66}
84 67
85/** 68/**
86 * Frontend for esrv_print_msg 69 * Frontend for esrv_print_msg
87 * \param colr message color 70 * \param colr message color
… …
90 * 73 *
91 * If pl is NULL or without contr set, writes message to log. 74 * If pl is NULL or without contr set, writes message to log.
92 * 75 *
93 * Else sends message to player via esrv_print_msg 76 * Else sends message to player via esrv_print_msg
94 */ 77 */
95
96static void 78static void
97print_message (int colr, const object *pl, const char *tmp) 79print_message (int colr, const object *pl, const char *tmp)
98{ 80{
99 81 if (!tmp)
100 if (tmp == (char *) NULL)
101 {
102 tmp = "[NULL]"; 82 tmp = "[NULL]";
103 }
104 83
105 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 84 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
106 return; 85 return;
107 86
108 if (pl->type == PLAYER) 87 if (pl->type == PLAYER)
109 {
110 esrv_print_msg (&pl->contr->socket, colr, (char *) tmp); 88 esrv_print_msg (pl->contr->ns, colr, (char *) tmp);
111 return;
112 }
113} 89}
114
115 90
116/** 91/**
117 * Prints out the contents of specified buffer structures, 92 * Prints out the contents of specified buffer structures,
118 * and clears the string. 93 * and clears the string.
119 */ 94 */
120
121void 95void
122flush_output_element (const object *pl, Output_Buf * outputs) 96flush_output_element (const object *pl, Output_Buf * outputs)
123{ 97{
124 char tbuf[MAX_BUF]; 98 char tbuf[MAX_BUF];
125 99
… …
149 * If found, checks if message should be sent now. 123 * If found, checks if message should be sent now.
150 * 124 *
151 * If message not already in buffers, flushes olders buffer, 125 * If message not already in buffers, flushes olders buffer,
152 * and adds message to queue. 126 * and adds message to queue.
153 */ 127 */
154
155static void 128static void
156check_output_buffers (const object *pl, const char *buf) 129check_output_buffers (const object *pl, const char *buf)
157{ 130{
158 int i, oldest = 0; 131 int i, oldest = 0;
159 132
… …
190 pl->contr->outputs[oldest].buf = buf; 163 pl->contr->outputs[oldest].buf = buf;
191 } 164 }
192 } 165 }
193} 166}
194 167
195
196
197/** 168/**
198 * Sends message to player(s). 169 * Sends message to player(s).
199 * 170 *
200 * flags is various flags - mostly color, plus a few specials. 171 * flags is various flags - mostly color, plus a few specials.
201 * 172 *
… …
212 */ 183 */
213 184
214void 185void
215new_draw_info (int flags, int pri, const object *pl, const char *buf) 186new_draw_info (int flags, int pri, const object *pl, const char *buf)
216{ 187{
217
218 if (flags & NDI_ALL) 188 if (flags & NDI_ALL)
219 { 189 {
220 player *tmppl; 190 for_all_players (pl)
221 int i;
222
223 for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
224 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); 191 new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
225
226 for (i = 1; i < socket_info.allocated_sockets; i++)
227 {
228 if (init_sockets[i].status == Ns_Old && init_sockets[i].old_mode != Old_Listen && pri < 10)
229 {
230 cs_write_string (&init_sockets[i], buf, strlen (buf));
231 /* Most messages don't have a newline, so add one */
232 cs_write_string (&init_sockets[i], "\n", 1);
233 }
234 }
235 192
236 return; 193 return;
237 } 194 }
238 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 195
239 { 196 if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns)
240 /* Write to the socket? */
241 print_message (0, NULL, buf);
242 return; 197 return;
243 } 198
244 if (pl->type != PLAYER)
245 return;
246 if (pri >= pl->contr->listening) 199 if (pri >= pl->contr->listening)
247 return; 200 return;
248 201
249 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) 202 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE))
250 {
251 /* following prints stuff out, as appropriate */
252 check_output_buffers (pl, buf); 203 check_output_buffers (pl, buf);
253 }
254 else 204 else
255 {
256 print_message (flags & NDI_COLOR_MASK, pl, buf); 205 print_message (flags & NDI_COLOR_MASK, pl, buf);
257 }
258} 206}
259 207
260/** 208/**
261 * Wrapper for new_draw_info printf-like. 209 * Wrapper for new_draw_info printf-like.
262 * 210 *
263 * This is a pretty trivial function, but it allows us to use printf style 211 * This is a pretty trivial function, but it allows us to use printf style
264 * formatting, so instead of the calling function having to do it, we do 212 * formatting, so instead of the calling function having to do it, we do
265 * it here. It may also have advantages in the future for reduction of 213 * it here. It may also have advantages in the future for reduction of
266 * client/server bandwidth (client could keep track of various strings 214 * client/server bandwidth (client could keep track of various strings
267 */ 215 */
268
269void 216void
270new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...) 217new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...)
271{ 218{
272 char buf[HUGE_BUF]; 219 char buf[HUGE_BUF];
273 220
274 va_list ap; 221 va_list ap;
275
276 va_start (ap, format); 222 va_start (ap, format);
277
278 vsnprintf (buf, HUGE_BUF, format, ap); 223 vsnprintf (buf, HUGE_BUF, format, ap);
279
280 va_end (ap); 224 va_end (ap);
281 225
282 new_draw_info (flags, pri, pl, buf); 226 new_draw_info (flags, pri, pl, buf);
283} 227}
284 228
285
286void 229void
287draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage) 230draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage)
288{ 231{
289 232
290 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 233 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
291 return; 234 return;
292 235
293 if (pri >= pl->contr->listening) 236 if (pri >= pl->contr->listening)
294 return; 237 return;
238
295 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 239 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
296 { 240 {
297 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 241 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
298 242
299 if (buf == NULL) 243 if (buf == NULL)
300 LOG (llevError, "info::draw_ext_info -> Out of memory!"); 244 LOG (llevError, "info::draw_ext_info -> Out of memory!");
… …
305 new_draw_info (flags, pri, pl, buf); 249 new_draw_info (flags, pri, pl, buf);
306 free (buf); 250 free (buf);
307 } 251 }
308 } 252 }
309 else 253 else
310 {
311 esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, message); 254 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, message);
312 }
313} 255}
314 256
315void 257void
316draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...) 258draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
317{ 259{
318
319 char buf[HUGE_BUF]; 260 char buf[HUGE_BUF];
320 261
321 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 262 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
322 return; 263 return;
323 264
324 if (pri >= pl->contr->listening) 265 if (pri >= pl->contr->listening)
325 return; 266 return;
267
326 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 268 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
327 { 269 {
328 va_list ap; 270 va_list ap;
329 271
330 LOG (llevDebug, "Non supported extension text type for client.\n"); 272 LOG (llevDebug, "Non supported extension text type for client.\n");
331 va_start (ap, new_format); 273 va_start (ap, new_format);
… …
340 282
341 va_start (ap, new_format); 283 va_start (ap, new_format);
342 vsnprintf (buf, HUGE_BUF, new_format, ap); 284 vsnprintf (buf, HUGE_BUF, new_format, ap);
343 va_end (ap); 285 va_end (ap);
344 strip_media_tag (buf); 286 strip_media_tag (buf);
345 esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, buf); 287 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);
346 } 288 }
347} 289}
348 290
349/** 291/**
350 * Writes to everyone on the map *except* op. This is useful for emotions. 292 * Writes to everyone on the map *except* op. This is useful for emotions.
351 */ 293 */
352 294
353void 295void
354new_info_map_except (int color, mapstruct *map, object *op, const char *str) 296new_info_map_except (int color, maptile * map, object *op, const char *str)
355{ 297{
356 player *pl; 298 for_all_players (pl)
357
358 for (pl = first_player; pl != NULL; pl = pl->next)
359 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 299 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
360 {
361 new_draw_info (color, 0, pl->ob, str); 300 new_draw_info (color, 0, pl->ob, str);
362 }
363} 301}
364 302
365/** 303/**
366 * Writes to everyone on the map except op1 and op2 304 * Writes to everyone on the map except op1 and op2
367 */ 305 */
368 306
369void 307void
370new_info_map_except2 (int color, mapstruct *map, object *op1, object *op2, const char *str) 308new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
371{ 309{
372 player *pl; 310 for_all_players (pl)
373
374 for (pl = first_player; pl != NULL; pl = pl->next)
375 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) 311 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
376 {
377 new_draw_info (color, 0, pl->ob, str); 312 new_draw_info (color, 0, pl->ob, str);
378 }
379} 313}
380 314
381/** 315/**
382 * Writes to everyone on the specified map 316 * Writes to everyone on the specified map
383 */ 317 */
384 318
385void 319void
386new_info_map (int color, mapstruct *map, const char *str) 320new_info_map (int color, maptile * map, const char *str)
387{ 321{
388 player *pl; 322 for_all_players (pl)
389
390 for (pl = first_player; pl != NULL; pl = pl->next)
391 if (pl->ob != NULL && pl->ob->map == map) 323 if (pl->ob != NULL && pl->ob->map == map)
392 {
393 new_draw_info (color, 0, pl->ob, str); 324 new_draw_info (color, 0, pl->ob, str);
394 }
395} 325}
396
397 326
398/** 327/**
399 * This does nothing now. However, in theory, we should probably send 328 * This does nothing now. However, in theory, we should probably send
400 * something to the client and let the client figure out how it might want 329 * something to the client and let the client figure out how it might want
401 * to handle this 330 * to handle this
… …
411void 340void
412rangetostring (object *pl, char *obuf) 341rangetostring (object *pl, char *obuf)
413{ 342{
414 switch (pl->contr->shoottype) 343 switch (pl->contr->shoottype)
415 { 344 {
416 case range_none: 345 case range_none:
417 strcpy (obuf, "Range: nothing"); 346 strcpy (obuf, "Range: nothing");
418 break; 347 break;
419 348
420 case range_bow: 349 case range_bow:
350 {
351 object *op;
352
353 for (op = pl->inv; op; op = op->below)
354 if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED))
355 break;
356
357 if (op == NULL)
358 break;
359
360 sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing");
361 }
362 break;
363
364 case range_magic:
365 if (settings.casting_time == TRUE)
421 { 366 {
422 object *op; 367 if (pl->casting_time > -1)
423 368 {
424 for (op = pl->inv; op; op = op->below) 369 if (pl->casting_time == 0)
425 if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED)) 370 sprintf (obuf, "Range: Holding spell (%s)", &pl->spell->name);
426 break; 371 else
427 if (op == NULL) 372 sprintf (obuf, "Range: Casting spell (%s)", &pl->spell->name);
428 break; 373 }
429 374 else
430 sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing"); 375 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
431 } 376 }
432 break;
433
434 case range_magic:
435 if (settings.casting_time == TRUE)
436 {
437 if (pl->casting_time > -1)
438 {
439 if (pl->casting_time == 0)
440 sprintf (obuf, "Range: Holding spell (%s)", (const char *) pl->spell->name);
441 else
442 sprintf (obuf, "Range: Casting spell (%s)", (const char *) pl->spell->name);
443 }
444 else
445 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
446 }
447 else 377 else
448 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name); 378 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
449 break; 379 break;
450 380
451 case range_misc: 381 case range_misc:
452 sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none"); 382 sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none");
453 break; 383 break;
454 384
455 /* range_scroll is only used for controlling golems. If the 385 /* range_scroll is only used for controlling golems. If the
456 * the player does not have a golem, reset some things. 386 * the player does not have a golem, reset some things.
457 */ 387 */
458 case range_golem: 388 case range_golem:
459 if (pl->contr->ranges[range_golem] != NULL) 389 if (pl->contr->ranges[range_golem] != NULL)
460 sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name); 390 sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name);
461 else 391 else
462 { 392 {
463 pl->contr->shoottype = range_none; 393 pl->contr->shoottype = range_none;
464 strcpy (obuf, "Range: nothing"); 394 strcpy (obuf, "Range: nothing");
465 } 395 }
466 break; 396 break;
467 397
468 case range_skill: 398 case range_skill:
469 sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none"); 399 sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none");
470 break; 400 break;
471 401
472 case range_builder: 402 case range_builder:
473 sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0)); 403 sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0));
474 break; 404 break;
475 405
476 default: 406 default:
477 strcpy (obuf, "Range: illegal"); 407 strcpy (obuf, "Range: illegal");
478 } 408 }
479} 409}
480 410
481/** 411/**
482 * Sets player title. 412 * Sets player title.
… …
489 sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title); 419 sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title);
490 else 420 else
491 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); 421 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title);
492} 422}
493 423
494
495/** 424/**
496 * Helper for magic map creation. 425 * Helper for magic map creation.
497 * 426 *
498 * Takes a player, the map_mark array and an x and y starting position. 427 * Takes a player, the map_mark array and an x and y starting position.
499 * pl is the player. 428 * pl is the player.
… …
506static void 435static void
507magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) 436magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py)
508{ 437{
509 int x, y, dx, dy, mflags; 438 int x, y, dx, dy, mflags;
510 sint16 nx, ny; 439 sint16 nx, ny;
511 mapstruct *mp; 440 maptile *mp;
512 New_Face *f;
513 441
514 for (dx = -1; dx <= 1; dx++) 442 for (dx = -1; dx <= 1; dx++)
515 { 443 {
516 for (dy = -1; dy <= 1; dy++) 444 for (dy = -1; dy <= 1; dy++)
517 { 445 {
… …
529 if (mflags & P_OUT_OF_MAP) 457 if (mflags & P_OUT_OF_MAP)
530 continue; 458 continue;
531 459
532 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) 460 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
533 { 461 {
534 f = GET_MAP_FACE (mp, nx, ny, 0); 462 int f = GET_MAP_FACE (mp, nx, ny, 0);
535 if (f == blank_face) 463 if (f == blank_face)
464 {
536 f = GET_MAP_FACE (mp, nx, ny, 1); 465 f = GET_MAP_FACE (mp, nx, ny, 1);
537 if (f == blank_face) 466 if (f == blank_face)
538 f = GET_MAP_FACE (mp, nx, ny, 2); 467 f = GET_MAP_FACE (mp, nx, ny, 2);
468 }
469
470 int magicmap = faces [f].magicmap;
539 471
540 /* Should probably have P_NO_MAGIC here also, but then shops don't 472 /* Should probably have P_NO_MAGIC here also, but then shops don't
541 * work. 473 * work.
542 */ 474 */
543 if (mflags & P_BLOCKSVIEW) 475 if (mflags & P_BLOCKSVIEW)
544 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); 476 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
545 else 477 else
546 { 478 {
547 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); 479 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap;
548 magic_mapping_mark_recursive (pl, map_mark, x, y); 480 magic_mapping_mark_recursive (pl, map_mark, x, y);
549 } 481 }
550 } 482 }
551 } 483 }
552 } 484 }
553} 485}
554
555 486
556/** 487/**
557 * Creates magic map for player. 488 * Creates magic map for player.
558 * 489 *
559 * Note: For improved magic mapping display, the space that blocks 490 * Note: For improved magic mapping display, the space that blocks
… …
561 * being nonzero have been changed to check for 1. Also, since 492 * being nonzero have been changed to check for 1. Also, since
562 * map_mark is a char value, putting 2 in should cause no problems. 493 * map_mark is a char value, putting 2 in should cause no problems.
563 * 494 *
564 * This function examines the map the player is on, and determines what 495 * This function examines the map the player is on, and determines what
565 * is visible. 2 is set for walls or objects that blocks view. 1 496 * is visible. 2 is set for walls or objects that blocks view. 1
566 * is for open spaces. map_mark should already have been initialized 497 * is for open spaces. map_mark should already have been initialised
567 * to zero before this is called. 498 * to zero before this is called.
568 * strength is an initial strength*2 rectangular area that we automatically 499 * strength is an initial strength*2 rectangular area that we automatically
569 * see in/penetrate through. 500 * see in/penetrate through.
570 */ 501 */
571
572void 502void
573magic_mapping_mark (object *pl, char *map_mark, int strength) 503magic_mapping_mark (object *pl, char *map_mark, int strength)
574{ 504{
575 int x, y, mflags; 505 int x, y, mflags;
576 sint16 nx, ny; 506 sint16 nx, ny;
577 mapstruct *mp; 507 maptile *mp;
578 New_Face *f;
579 508
580 for (x = -strength; x < strength; x++) 509 for (x = -strength; x < strength; x++)
581 { 510 {
582 for (y = -strength; y < strength; y++) 511 for (y = -strength; y < strength; y++)
583 { 512 {
584 mp = pl->map; 513 mp = pl->map;
585 nx = pl->x + x; 514 nx = pl->x + x;
586 ny = pl->y + y; 515 ny = pl->y + y;
516
587 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 517 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
588 if (mflags & P_OUT_OF_MAP) 518 if (mflags & P_OUT_OF_MAP)
589 continue; 519 continue;
590 else 520
521 int f = GET_MAP_FACE (mp, nx, ny, 0);
522 if (f == blank_face)
591 { 523 {
592 f = GET_MAP_FACE (mp, nx, ny, 0);
593 if (f == blank_face)
594 f = GET_MAP_FACE (mp, nx, ny, 1); 524 f = GET_MAP_FACE (mp, nx, ny, 1);
595 if (f == blank_face) 525 if (f == blank_face)
596 f = GET_MAP_FACE (mp, nx, ny, 2); 526 f = GET_MAP_FACE (mp, nx, ny, 2);
597 } 527 }
598 528
529 int magicmap = faces [f].magicmap;
530
599 if (mflags & P_BLOCKSVIEW) 531 if (mflags & P_BLOCKSVIEW)
600 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); 532 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
601 else 533 else
602 { 534 {
603 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); 535 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap;
604 magic_mapping_mark_recursive (pl, map_mark, x, y); 536 magic_mapping_mark_recursive (pl, map_mark, x, y);
605 } 537 }
606 } 538 }
607 } 539 }
608} 540}
609 541
610
611/** 542/**
612 * Creates and sends magic map to player. 543 * Creates and sends magic map to player.
613 * 544 *
614 * The following function is a lot messier than it really should be, 545 * The following function is a lot messier than it really should be,
615 * but there is no real easy solution. 546 * but there is no real easy solution.
616 * 547 *
617 * Mark Wedel 548 * Mark Wedel
618 */ 549 */
619
620void 550void
621draw_magic_map (object *pl) 551draw_magic_map (object *pl)
622{ 552{
623 int x, y;
624 char *map_mark = (char *) calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); 553 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
625 int xmin, xmax, ymin, ymax; 554 int xmin, xmax, ymin, ymax;
626 SockList sl;
627 555
628 if (pl->type != PLAYER) 556 if (pl->type != PLAYER)
629 { 557 {
630 LOG (llevError, "Non player object called draw_map.\n"); 558 LOG (llevError, "Non player object called draw_map.\n");
631 return; 559 return;
… …
641 */ 569 */
642 xmin = MAGIC_MAP_SIZE; 570 xmin = MAGIC_MAP_SIZE;
643 ymin = MAGIC_MAP_SIZE; 571 ymin = MAGIC_MAP_SIZE;
644 xmax = 0; 572 xmax = 0;
645 ymax = 0; 573 ymax = 0;
574
646 for (x = 0; x < MAGIC_MAP_SIZE; x++) 575 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
647 {
648 for (y = 0; y < MAGIC_MAP_SIZE; y++) 576 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
649 {
650 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 577 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
651 { 578 {
652 xmin = x < xmin ? x : xmin; 579 xmin = x < xmin ? x : xmin;
653 xmax = x > xmax ? x : xmax; 580 xmax = x > xmax ? x : xmax;
654 ymin = y < ymin ? y : ymin; 581 ymin = y < ymin ? y : ymin;
655 ymax = y > ymax ? y : ymax; 582 ymax = y > ymax ? y : ymax;
656 } 583 }
657 }
658 }
659 584
660 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 585 packet sl;
661 snprintf ((char *) sl.buf, MAXSOCKBUF, "magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1), 586 sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),
662 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); 587 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
663 sl.len = strlen ((char *) sl.buf);
664 588
665 for (y = ymin; y <= ymax; y++) 589 for (int y = ymin; y <= ymax; y++)
666 {
667 for (x = xmin; x <= xmax; x++) 590 for (int x = xmin; x <= xmax; x++)
668 {
669 sl.buf[sl.len++] = map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR; 591 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
670 } /* x loop */
671 } /* y loop */
672 592
673 Send_With_Handling (&pl->contr->socket, &sl); 593 pl->contr->ns->send_packet (sl);
674 free (sl.buf); 594
675 free (map_mark); 595 free (map_mark);
676} 596}
677 597
678
679/** 598/**
680 * Send a kill log record to sockets 599 * Send a kill log record to sockets
681 */ 600 */
682
683void 601void
684Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType) 602Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType)
685{ 603{
686 int i;
687 size_t len; 604 size_t len;
688 char buf[MAX_BUF]; 605 char buf[MAX_BUF];
689 606
690 if (With != NULL) 607 if (With != NULL)
691 {
692 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType); 608 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType);
693 }
694 else 609 else
695 {
696 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType); 610 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
697 } 611
698 len = strlen (buf); 612 len = strlen (buf);
699 for (i = 1; i < socket_info.allocated_sockets; i++)
700 {
701 if (init_sockets[i].old_mode == Old_Listen)
702 {
703 cs_write_string (&init_sockets[i], buf, len);
704 }
705 }
706} 613}
614

Diff Legend

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