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.35 by root, Sun Mar 11 02:12:45 2007 UTC vs.
Revision 1.40 by root, Mon Apr 30 04:25:30 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.
… …
333clear_win_info (object *op) 301clear_win_info (object *op)
334{ 302{
335} 303}
336 304
337/** 305/**
338 * Get player's current range attack in obuf.
339 */
340void
341rangetostring (object *pl, char *obuf)
342{
343 switch (pl->contr->shoottype)
344 {
345 case range_none:
346 strcpy (obuf, "Range: nothing");
347 break;
348
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)
366 {
367 if (pl->casting_time > -1)
368 {
369 if (pl->casting_time == 0)
370 sprintf (obuf, "Range: Holding spell (%s)", &pl->spell->name);
371 else
372 sprintf (obuf, "Range: Casting spell (%s)", &pl->spell->name);
373 }
374 else
375 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
376 }
377 else
378 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
379 break;
380
381 case range_misc:
382 sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none");
383 break;
384
385 /* range_scroll is only used for controlling golems. If the
386 * the player does not have a golem, reset some things.
387 */
388 case range_golem:
389 if (pl->contr->ranges[range_golem] != NULL)
390 sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name);
391 else
392 {
393 pl->contr->shoottype = range_none;
394 strcpy (obuf, "Range: nothing");
395 }
396 break;
397
398 case range_skill:
399 sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none");
400 break;
401
402 case range_builder:
403 sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0));
404 break;
405
406 default:
407 strcpy (obuf, "Range: illegal");
408 }
409}
410
411/**
412 * Sets player title. 306 * Sets player title.
413 */ 307 */
414void 308void
415set_title (object *pl, char *buf) 309set_title (object *pl, char *buf)
416{ 310{
417 /* Eneq(@csd.uu.se): Let players define their own titles. */ 311 /* Eneq(@csd.uu.se): Let players define their own titles. */
418 if (pl->contr->own_title[0] == '\0') 312 if (pl->contr->own_title[0] == '\0')
419 sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title); 313 sprintf (buf, "Player: %s the %s", (const char *) pl->name, (const char *) pl->contr->title);
420 else 314 else
421 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); 315 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title);
316}
317
318// formerly a macro, used only by magic map, so optimised it out
319static inline faceidx
320GET_MAP_FACE (maptile *m, int x, int y, int layer)
321{
322 if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer))
323 return op->face;
324 else
325 return 0;
422} 326}
423 327
424/** 328/**
425 * Helper for magic map creation. 329 * Helper for magic map creation.
426 * 330 *

Diff Legend

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