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.5 by root, Sun Sep 10 13:43:33 2006 UTC vs.
Revision 1.39 by root, Sun Apr 29 21:44:35 2007 UTC

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

Diff Legend

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