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.9 by root, Tue Sep 19 10:12:41 2006 UTC vs.
Revision 1.41 by root, Thu May 3 10:39:46 2007 UTC

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

Diff Legend

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