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.38 by root, Wed Apr 25 18:47:51 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.
… …
384 352
385 /* range_scroll is only used for controlling golems. If the 353 /* range_scroll is only used for controlling golems. If the
386 * the player does not have a golem, reset some things. 354 * the player does not have a golem, reset some things.
387 */ 355 */
388 case range_golem: 356 case range_golem:
389 if (pl->contr->ranges[range_golem] != NULL) 357 if (object *golem = pl->contr->ranges[range_golem])
390 sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name); 358 sprintf (obuf, "Range: golem (%s)", &golem->name);
391 else 359 else
392 { 360 {
393 pl->contr->shoottype = range_none; 361 pl->contr->shoottype = range_none;
394 strcpy (obuf, "Range: nothing"); 362 strcpy (obuf, "Range: nothing");
395 } 363 }
… …
419 sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title); 387 sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title);
420 else 388 else
421 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); 389 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title);
422} 390}
423 391
392// formerly a macro, used only by magic map, so optimised it out
393static inline faceidx
394GET_MAP_FACE (maptile *m, int x, int y, int layer)
395{
396 if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer))
397 return op->face;
398 else
399 return 0;
400}
424 401
425/** 402/**
426 * Helper for magic map creation. 403 * Helper for magic map creation.
427 * 404 *
428 * Takes a player, the map_mark array and an x and y starting position. 405 * 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) 414magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py)
438{ 415{
439 int x, y, dx, dy, mflags; 416 int x, y, dx, dy, mflags;
440 sint16 nx, ny; 417 sint16 nx, ny;
441 maptile *mp; 418 maptile *mp;
442 facetile *f;
443 419
444 for (dx = -1; dx <= 1; dx++) 420 for (dx = -1; dx <= 1; dx++)
445 { 421 {
446 for (dy = -1; dy <= 1; dy++) 422 for (dy = -1; dy <= 1; dy++)
447 { 423 {
… …
459 if (mflags & P_OUT_OF_MAP) 435 if (mflags & P_OUT_OF_MAP)
460 continue; 436 continue;
461 437
462 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) 438 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
463 { 439 {
464 f = GET_MAP_FACE (mp, nx, ny, 0); 440 int f = GET_MAP_FACE (mp, nx, ny, 0);
465 if (f == blank_face) 441 if (f == blank_face)
442 {
466 f = GET_MAP_FACE (mp, nx, ny, 1); 443 f = GET_MAP_FACE (mp, nx, ny, 1);
467 if (f == blank_face) 444 if (f == blank_face)
468 f = GET_MAP_FACE (mp, nx, ny, 2); 445 f = GET_MAP_FACE (mp, nx, ny, 2);
446 }
447
448 int magicmap = faces [f].magicmap;
469 449
470 /* Should probably have P_NO_MAGIC here also, but then shops don't 450 /* Should probably have P_NO_MAGIC here also, but then shops don't
471 * work. 451 * work.
472 */ 452 */
473 if (mflags & P_BLOCKSVIEW) 453 if (mflags & P_BLOCKSVIEW)
474 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); 454 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
475 else 455 else
476 { 456 {
477 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); 457 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); 458 magic_mapping_mark_recursive (pl, map_mark, x, y);
479 } 459 }
480 } 460 }
481 } 461 }
482 } 462 }
483} 463}
484
485 464
486/** 465/**
487 * Creates magic map for player. 466 * Creates magic map for player.
488 * 467 *
489 * Note: For improved magic mapping display, the space that blocks 468 * Note: For improved magic mapping display, the space that blocks
… …
496 * is for open spaces. map_mark should already have been initialised 475 * is for open spaces. map_mark should already have been initialised
497 * to zero before this is called. 476 * to zero before this is called.
498 * strength is an initial strength*2 rectangular area that we automatically 477 * strength is an initial strength*2 rectangular area that we automatically
499 * see in/penetrate through. 478 * see in/penetrate through.
500 */ 479 */
501
502void 480void
503magic_mapping_mark (object *pl, char *map_mark, int strength) 481magic_mapping_mark (object *pl, char *map_mark, int strength)
504{ 482{
505 int x, y, mflags; 483 int x, y, mflags;
506 sint16 nx, ny; 484 sint16 nx, ny;
507 maptile *mp; 485 maptile *mp;
508 facetile *f;
509 486
510 for (x = -strength; x < strength; x++) 487 for (x = -strength; x < strength; x++)
511 { 488 {
512 for (y = -strength; y < strength; y++) 489 for (y = -strength; y < strength; y++)
513 { 490 {
514 mp = pl->map; 491 mp = pl->map;
515 nx = pl->x + x; 492 nx = pl->x + x;
516 ny = pl->y + y; 493 ny = pl->y + y;
494
517 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 495 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
518 if (mflags & P_OUT_OF_MAP) 496 if (mflags & P_OUT_OF_MAP)
519 continue; 497 continue;
520 else 498
499 int f = GET_MAP_FACE (mp, nx, ny, 0);
500 if (f == blank_face)
521 { 501 {
522 f = GET_MAP_FACE (mp, nx, ny, 0);
523 if (f == blank_face)
524 f = GET_MAP_FACE (mp, nx, ny, 1); 502 f = GET_MAP_FACE (mp, nx, ny, 1);
525 if (f == blank_face) 503 if (f == blank_face)
526 f = GET_MAP_FACE (mp, nx, ny, 2); 504 f = GET_MAP_FACE (mp, nx, ny, 2);
527 } 505 }
528 506
507 int magicmap = faces [f].magicmap;
508
529 if (mflags & P_BLOCKSVIEW) 509 if (mflags & P_BLOCKSVIEW)
530 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); 510 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap;
531 else 511 else
532 { 512 {
533 map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); 513 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); 514 magic_mapping_mark_recursive (pl, map_mark, x, y);
535 } 515 }
536 } 516 }
537 } 517 }
538} 518}

Diff Legend

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