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.6 by root, Thu Sep 14 22:34:05 2006 UTC vs.
Revision 1.44 by root, Tue Jun 5 13:05:03 2007 UTC

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

Diff Legend

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