| … | |
… | |
| 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 | /** |
91 | bool |
| 92 | * Prints out the contents of specified buffer structures, |
92 | client::msg_suppressed (const char *msg) |
| 93 | * and clears the string. |
|
|
| 94 | */ |
|
|
| 95 | void |
|
|
| 96 | flush_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 | */ |
|
|
| 128 | static void |
|
|
| 129 | check_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 | |
|
|
| 185 | void |
154 | void |
| 186 | new_draw_info (int flags, int pri, const object *pl, const char *buf) |
155 | new_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. |
