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.34 by pippijn, Thu Mar 1 12:28:17 2007 UTC vs.
Revision 1.39 by root, Sun Apr 29 21:44:35 2007 UTC

… …
86 86
87 if (pl->type == PLAYER) 87 if (pl->type == PLAYER)
88 esrv_print_msg (pl->contr->ns, colr, (char *) tmp); 88 esrv_print_msg (pl->contr->ns, colr, (char *) tmp);
89} 89}
90 90
91/** 91bool
92 * Prints out the contents of specified buffer structures, 92client::msg_suppressed (const char *msg)
93 * and clears the string.
94 */
95void
96flush_output_element (const object *pl, Output_Buf * outputs)
97{ 93{
98 char tbuf[MAX_BUF]; 94 if (!pl)
99
100 if (outputs->buf == NULL)
101 return; 95 return false;
102 if (outputs->count > 1) 96
103 { 97 if (pl->outputs_count <= 1 || !pl->outputs_sync)
104 snprintf (tbuf, MAX_BUF, "%d times %s", outputs->count, &outputs->buf); 98 return false;
105 print_message (NDI_BLACK, pl, tbuf); 99
100 int len = strlen (msg);
101
102 if (len > MSG_BUF_SIZE)
103 return false;
104
105 msg_buf *lru = msgbuf;
106 for (msg_buf *buf = msgbuf; buf < msgbuf + MSG_BUF_COUNT; ++buf)
106 } 107 {
107 else 108 if (len == buf->len && !memcmp (msg, buf->msg, len))
108 print_message (NDI_BLACK, pl, &outputs->buf);
109
110 outputs->buf = NULL;
111 outputs->first_update = 0; /* This way, it will be reused */
112}
113
114/**
115 * Sends message to player through output buffers.
116 * \param pl player to send message
117 * \param buf message to send
118 *
119 * If player's output_count is 1, sends message directly.
120 *
121 * Else checks output buffers for specified message.
122 *
123 * If found, checks if message should be sent now.
124 *
125 * If message not already in buffers, flushes olders buffer,
126 * and adds message to queue.
127 */
128static void
129check_output_buffers (const object *pl, const char *buf)
130{
131 int i, oldest = 0;
132
133 if (pl->contr->outputs_count < 2)
134 {
135 print_message (NDI_BLACK, pl, buf);
136 return;
137 }
138 else
139 {
140 for (i = 0; i < NUM_OUTPUT_BUFS; i++)
141 { 109 {
142 if (pl->contr->outputs[i].buf && !strcmp (buf, pl->contr->outputs[i].buf)) 110 // found matching buf, see if expired
111 if (buf->expire <= pticks || !buf->count)
143 break; 112 {
144 else if (pl->contr->outputs[i].first_update < pl->contr->outputs[oldest].first_update) 113 // yes, take over matching buffer, print
145 oldest = i; 114 buf->expire = pticks + pl->outputs_sync;
115 buf->count = pl->outputs_count;
116
117 return false;
118 }
119
120 // no, suppress
121 --buf->count;
122 return true;
146 } 123 }
147 /* We found a match */
148 if (i < NUM_OUTPUT_BUFS)
149 {
150 pl->contr->outputs[i].count++;
151 if (pl->contr->outputs[i].count >= pl->contr->outputs_count)
152 {
153 flush_output_element (pl, &pl->contr->outputs[i]);
154 }
155 }
156 /* No match - flush the oldest, and put the new one in */
157 else
158 {
159 flush_output_element (pl, &pl->contr->outputs[oldest]);
160 124
161 pl->contr->outputs[oldest].first_update = pticks; 125 if (lru->expire > buf->expire)
162 pl->contr->outputs[oldest].count = 1; 126 lru = buf;
163 pl->contr->outputs[oldest].buf = buf;
164 }
165 } 127 }
128
129 // new message, evoke oldest buffer
130 lru->expire = pticks + pl->outputs_sync;
131 lru->count = pl->outputs_count;
132 lru->len = len;
133 memcpy (lru->msg, msg, len);
134
135 return false;
166} 136}
167 137
168/** 138/**
169 * Sends message to player(s). 139 * Sends message to player(s).
170 * 140 *
… …
179 * in the flags. 149 * in the flags.
180 * 150 *
181 * If message is black, and not NDI_UNIQUE, gets sent through output buffers. 151 * If message is black, and not NDI_UNIQUE, gets sent through output buffers.
182 * 152 *
183 */ 153 */
184
185void 154void
186new_draw_info (int flags, int pri, const object *pl, const char *buf) 155new_draw_info (int flags, int pri, const object *pl, const char *buf)
187{ 156{
188 if (flags & NDI_ALL) 157 if (flags & NDI_ALL)
189 { 158 {
… …
197 return; 166 return;
198 167
199 if (pri >= pl->contr->listening) 168 if (pri >= pl->contr->listening)
200 return; 169 return;
201 170
202 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) 171 if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK
203 check_output_buffers (pl, buf); 172 || !pl->contr->ns->msg_suppressed (buf))
204 else
205 print_message (flags & NDI_COLOR_MASK, pl, buf); 173 print_message (flags & NDI_COLOR_MASK, pl, buf);
206} 174}
207 175
208/** 176/**
209 * Wrapper for new_draw_info printf-like. 177 * Wrapper for new_draw_info printf-like.
… …
340void 308void
341rangetostring (object *pl, char *obuf) 309rangetostring (object *pl, char *obuf)
342{ 310{
343 switch (pl->contr->shoottype) 311 switch (pl->contr->shoottype)
344 { 312 {
345 case range_none:
346 strcpy (obuf, "Range: nothing");
347 break;
348
349 case range_bow: 313 case range_bow:
350 {
351 object *op;
352
353 for (op = pl->inv; op; op = op->below) 314 for (object *op = pl->inv; op; op = op->below)
354 if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED)) 315 if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED))
355 break;
356
357 if (op == NULL)
358 break; 316 {
359
360 sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing"); 317 sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? &op->race : "nothing");
318 return;
361 } 319 }
320
362 break; 321 break;
363 322
364 case range_magic: 323 case range_magic:
365 if (settings.casting_time == TRUE) 324 if (settings.casting_time == TRUE)
366 { 325 {
367 if (pl->casting_time > -1) 326 if (pl->casting_time > -1)
368 { 327 {
369 if (pl->casting_time == 0) 328 if (pl->casting_time == 0)
370 sprintf (obuf, "Range: Holding spell (%s)", &pl->spell->name); 329 sprintf (obuf, "Holding spell: %s", &pl->spell->name);
371 else 330 else
372 sprintf (obuf, "Range: Casting spell (%s)", &pl->spell->name); 331 sprintf (obuf, "Casting spell: %s", &pl->spell->name);
373 } 332 }
374 else 333 else
375 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name); 334 sprintf (obuf, "Spell: %s", &pl->contr->ranges[range_magic]->name);
376 } 335 }
377 else 336 else
378 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name); 337 sprintf (obuf, "Spell: %s", &pl->contr->ranges[range_magic]->name);
338
379 break; 339 return;
380 340
381 case range_misc: 341 case range_misc:
382 sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none"); 342 if (object *op = pl->contr->ranges[range_misc])
343 {
344 sprintf (obuf, "Item: %s", query_base_name (op, 0));
345 return;
346 }
347
383 break; 348 break;
384 349
385 /* range_scroll is only used for controlling golems. If the 350 /* range_scroll is only used for controlling golems. If the
386 * the player does not have a golem, reset some things. 351 * the player does not have a golem, reset some things.
387 */ 352 */
388 case range_golem: 353 case range_golem:
389 if (pl->contr->ranges[range_golem] != NULL) 354 if (object *golem = pl->contr->ranges[range_golem])
390 sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name);
391 else
392 { 355 {
393 pl->contr->shoottype = range_none; 356 sprintf (obuf, "Golem: %s", &golem->name);
394 strcpy (obuf, "Range: nothing"); 357 return;
395 } 358 }
359
396 break; 360 break;
397 361
398 case range_skill: 362 case range_skill:
399 sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none"); 363 if (object *op = pl->chosen_skill)
364 {
365 sprintf (obuf, "Skill: %s", &op->name);
366 return;
367 }
368
400 break; 369 break;
401 370
402 case range_builder: 371 case range_builder:
403 sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0)); 372 sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0));
404 break; 373 return;
374 }
405 375
406 default: 376 pl->contr->shoottype = range_none;
407 strcpy (obuf, "Range: illegal"); 377 strcpy (obuf, "Range: nothing");
408 }
409} 378}
410 379
411/** 380/**
412 * Sets player title. 381 * Sets player title.
413 */ 382 */
… …
419 sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title); 388 sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title);
420 else 389 else
421 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); 390 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title);
422} 391}
423 392
393// formerly a macro, used only by magic map, so optimised it out
394static inline faceidx
395GET_MAP_FACE (maptile *m, int x, int y, int layer)
396{
397 if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer))
398 return op->face;
399 else
400 return 0;
401}
424 402
425/** 403/**
426 * Helper for magic map creation. 404 * Helper for magic map creation.
427 * 405 *
428 * Takes a player, the map_mark array and an x and y starting position. 406 * Takes a player, the map_mark array and an x and y starting position.
… …
437magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) 415magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py)
438{ 416{
439 int x, y, dx, dy, mflags; 417 int x, y, dx, dy, mflags;
440 sint16 nx, ny; 418 sint16 nx, ny;
441 maptile *mp; 419 maptile *mp;
442 facetile *f;
443 420
444 for (dx = -1; dx <= 1; dx++) 421 for (dx = -1; dx <= 1; dx++)
445 { 422 {
446 for (dy = -1; dy <= 1; dy++) 423 for (dy = -1; dy <= 1; dy++)
447 { 424 {
… …
459 if (mflags & P_OUT_OF_MAP) 436 if (mflags & P_OUT_OF_MAP)
460 continue; 437 continue;
461 438
462 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) 439 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
463 { 440 {
464 f = GET_MAP_FACE (mp, nx, ny, 0); 441 int f = GET_MAP_FACE (mp, nx, ny, 0);
465 if (f == blank_face) 442 if (f == blank_face)
443 {
466 f = GET_MAP_FACE (mp, nx, ny, 1); 444 f = GET_MAP_FACE (mp, nx, ny, 1);
467 if (f == blank_face) 445 if (f == blank_face)
468 f = GET_MAP_FACE (mp, nx, ny, 2); 446 f = GET_MAP_FACE (mp, nx, ny, 2);
447 }
448
449 int magicmap = faces [f].magicmap;
469 450
470 /* Should probably have P_NO_MAGIC here also, but then shops don't 451 /* Should probably have P_NO_MAGIC here also, but then shops don't
471 * work. 452 * work.
472 */ 453 */
473 if (mflags & P_BLOCKSVIEW) 454 if (mflags & P_BLOCKSVIEW)
474 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); 455 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
475 else 456 else
476 { 457 {
477 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); 458 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap;
478 magic_mapping_mark_recursive (pl, map_mark, x, y); 459 magic_mapping_mark_recursive (pl, map_mark, x, y);
479 } 460 }
480 } 461 }
481 } 462 }
482 } 463 }
483} 464}
484
485 465
486/** 466/**
487 * Creates magic map for player. 467 * Creates magic map for player.
488 * 468 *
489 * Note: For improved magic mapping display, the space that blocks 469 * Note: For improved magic mapping display, the space that blocks
… …
496 * is for open spaces. map_mark should already have been initialised 476 * is for open spaces. map_mark should already have been initialised
497 * to zero before this is called. 477 * to zero before this is called.
498 * strength is an initial strength*2 rectangular area that we automatically 478 * strength is an initial strength*2 rectangular area that we automatically
499 * see in/penetrate through. 479 * see in/penetrate through.
500 */ 480 */
501
502void 481void
503magic_mapping_mark (object *pl, char *map_mark, int strength) 482magic_mapping_mark (object *pl, char *map_mark, int strength)
504{ 483{
505 int x, y, mflags; 484 int x, y, mflags;
506 sint16 nx, ny; 485 sint16 nx, ny;
507 maptile *mp; 486 maptile *mp;
508 facetile *f;
509 487
510 for (x = -strength; x < strength; x++) 488 for (x = -strength; x < strength; x++)
511 { 489 {
512 for (y = -strength; y < strength; y++) 490 for (y = -strength; y < strength; y++)
513 { 491 {
514 mp = pl->map; 492 mp = pl->map;
515 nx = pl->x + x; 493 nx = pl->x + x;
516 ny = pl->y + y; 494 ny = pl->y + y;
495
517 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 496 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
518 if (mflags & P_OUT_OF_MAP) 497 if (mflags & P_OUT_OF_MAP)
519 continue; 498 continue;
520 else 499
500 int f = GET_MAP_FACE (mp, nx, ny, 0);
501 if (f == blank_face)
521 { 502 {
522 f = GET_MAP_FACE (mp, nx, ny, 0);
523 if (f == blank_face)
524 f = GET_MAP_FACE (mp, nx, ny, 1); 503 f = GET_MAP_FACE (mp, nx, ny, 1);
525 if (f == blank_face) 504 if (f == blank_face)
526 f = GET_MAP_FACE (mp, nx, ny, 2); 505 f = GET_MAP_FACE (mp, nx, ny, 2);
527 } 506 }
528 507
508 int magicmap = faces [f].magicmap;
509
529 if (mflags & P_BLOCKSVIEW) 510 if (mflags & P_BLOCKSVIEW)
530 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); 511 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
531 else 512 else
532 { 513 {
533 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); 514 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap;
534 magic_mapping_mark_recursive (pl, map_mark, x, y); 515 magic_mapping_mark_recursive (pl, map_mark, x, y);
535 } 516 }
536 } 517 }
537 } 518 }
538} 519}

Diff Legend

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