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.14 by root, Thu Dec 14 01:12:35 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 SockList sl (MAXSOCKBUF);
51
52 if (ns->status == Ns_Old)
53 sl.printf ("%s\n", str);
54 else
55 sl.printf ("drawinfo %d %s", color, str); 50 ns->send_packet_printf ("drawinfo %d %s", color, str);
56
57 ns->send_packet (sl);
58 sl.free ();
59} 51}
60 52
61/** 53/**
62 * Draws an extended message on the client. 54 * Draws an extended message on the client.
63 * ns the socket to send message to 55 * ns the socket to send message to
… …
66 * subtype type and subtype of text message 58 * subtype type and subtype of text message
67 * 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
68 * message The main message 60 * message The main message
69 */ 61 */
70static void 62static void
71esrv_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)
72{ 64{
73 SockList sl (MAXSOCKBUF);
74
75 sl.printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message); 65 ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message);
76 ns->send_packet (sl);
77 sl.free ();
78} 66}
79 67
80/** 68/**
81 * Frontend for esrv_print_msg 69 * Frontend for esrv_print_msg
82 * \param colr message color 70 * \param colr message color
… …
85 * 73 *
86 * 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.
87 * 75 *
88 * Else sends message to player via esrv_print_msg 76 * Else sends message to player via esrv_print_msg
89 */ 77 */
90
91static void 78static void
92print_message (int colr, const object *pl, const char *tmp) 79print_message (int colr, const object *pl, const char *tmp)
93{ 80{
94
95 if (!tmp) 81 if (!tmp)
96 tmp = "[NULL]"; 82 tmp = "[NULL]";
97 83
98 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 84 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
99 return; 85 return;
100 86
101 if (pl->type == PLAYER) 87 if (pl->type == PLAYER)
102 {
103 esrv_print_msg (&pl->contr->socket, colr, (char *) tmp); 88 esrv_print_msg (pl->contr->ns, colr, (char *) tmp);
104 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)
105 } 107 {
106} 108 if (len == buf->len && !memcmp (msg, buf->msg, len))
107
108/**
109 * Prints out the contents of specified buffer structures,
110 * and clears the string.
111 */
112
113void
114flush_output_element (const object *pl, Output_Buf * outputs)
115{
116 char tbuf[MAX_BUF];
117
118 if (outputs->buf == NULL)
119 return;
120 if (outputs->count > 1)
121 {
122 snprintf (tbuf, MAX_BUF, "%d times %s", outputs->count, &outputs->buf);
123 print_message (NDI_BLACK, pl, tbuf);
124 }
125 else
126 print_message (NDI_BLACK, pl, &outputs->buf);
127
128 outputs->buf = NULL;
129 outputs->first_update = 0; /* This way, it will be reused */
130}
131
132/**
133 * Sends message to player through output buffers.
134 * \param pl player to send message
135 * \param buf message to send
136 *
137 * If player's output_count is 1, sends message directly.
138 *
139 * Else checks output buffers for specified message.
140 *
141 * If found, checks if message should be sent now.
142 *
143 * If message not already in buffers, flushes olders buffer,
144 * and adds message to queue.
145 */
146
147static void
148check_output_buffers (const object *pl, const char *buf)
149{
150 int i, oldest = 0;
151
152 if (pl->contr->outputs_count < 2)
153 {
154 print_message (NDI_BLACK, pl, buf);
155 return;
156 }
157 else
158 {
159 for (i = 0; i < NUM_OUTPUT_BUFS; i++)
160 { 109 {
161 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)
162 break; 112 {
163 else if (pl->contr->outputs[i].first_update < pl->contr->outputs[oldest].first_update) 113 // yes, take over matching buffer, print
164 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;
165 } 123 }
166 /* We found a match */
167 if (i < NUM_OUTPUT_BUFS)
168 {
169 pl->contr->outputs[i].count++;
170 if (pl->contr->outputs[i].count >= pl->contr->outputs_count)
171 {
172 flush_output_element (pl, &pl->contr->outputs[i]);
173 }
174 }
175 /* No match - flush the oldest, and put the new one in */
176 else
177 {
178 flush_output_element (pl, &pl->contr->outputs[oldest]);
179 124
180 pl->contr->outputs[oldest].first_update = pticks; 125 if (lru->expire > buf->expire)
181 pl->contr->outputs[oldest].count = 1; 126 lru = buf;
182 pl->contr->outputs[oldest].buf = buf;
183 }
184 } 127 }
185}
186 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);
187 134
135 return false;
136}
188 137
189/** 138/**
190 * Sends message to player(s). 139 * Sends message to player(s).
191 * 140 *
192 * flags is various flags - mostly color, plus a few specials. 141 * flags is various flags - mostly color, plus a few specials.
… …
200 * in the flags. 149 * in the flags.
201 * 150 *
202 * 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.
203 * 152 *
204 */ 153 */
205
206void 154void
207new_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)
208{ 156{
209
210 if (flags & NDI_ALL) 157 if (flags & NDI_ALL)
211 { 158 for_all_players (pl)
212 player *tmppl;
213
214 for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
215 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); 159 new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
216
217 return;
218 }
219
220 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
221 {
222 /* Write to the socket? */
223 print_message (0, NULL, buf);
224 return;
225 }
226
227 if (pl->type != PLAYER)
228 return;
229
230 if (pri >= pl->contr->listening)
231 return;
232
233 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE))
234 /* following prints stuff out, as appropriate */
235 check_output_buffers (pl, buf);
236 else 160 else
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))
237 print_message (flags & NDI_COLOR_MASK, pl, buf); 170 print_message (flags & NDI_COLOR_MASK, op, buf);
171 }
238} 172}
239 173
240/** 174/**
241 * Wrapper for new_draw_info printf-like. 175 * Wrapper for new_draw_info printf-like.
242 * 176 *
243 * 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
244 * 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
245 * 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
246 * client/server bandwidth (client could keep track of various strings 180 * client/server bandwidth (client could keep track of various strings
247 */ 181 */
248
249void 182void
250new_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, ...)
251{ 184{
252 char buf[HUGE_BUF]; 185 char buf[HUGE_BUF];
253 186
254 va_list ap; 187 va_list ap;
255
256 va_start (ap, format); 188 va_start (ap, format);
257
258 vsnprintf (buf, HUGE_BUF, format, ap); 189 vsnprintf (buf, HUGE_BUF, format, ap);
259
260 va_end (ap); 190 va_end (ap);
261 191
262 new_draw_info (flags, pri, pl, buf); 192 new_draw_info (flags, pri, pl, buf);
263} 193}
264
265 194
266void 195void
267draw_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)
268{ 197{
269 198
270 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 199 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
271 return; 200 return;
272 201
273 if (pri >= pl->contr->listening) 202 if (pri >= pl->contr->listening)
274 return; 203 return;
204
275 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 205 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
276 { 206 {
277 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 207 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
278 208
279 if (buf == NULL) 209 if (buf == NULL)
280 LOG (llevError, "info::draw_ext_info -> Out of memory!"); 210 LOG (llevError, "info::draw_ext_info -> Out of memory!");
… …
285 new_draw_info (flags, pri, pl, buf); 215 new_draw_info (flags, pri, pl, buf);
286 free (buf); 216 free (buf);
287 } 217 }
288 } 218 }
289 else 219 else
290 {
291 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);
292 }
293} 221}
294 222
295void 223void
296draw_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, ...)
297{ 225{
298
299 char buf[HUGE_BUF]; 226 char buf[HUGE_BUF];
300 227
301 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 228 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
302 return; 229 return;
303 230
304 if (pri >= pl->contr->listening) 231 if (pri >= pl->contr->listening)
305 return; 232 return;
233
306 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 234 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
307 { 235 {
308 va_list ap; 236 va_list ap;
309 237
310 LOG (llevDebug, "Non supported extension text type for client.\n"); 238 LOG (llevDebug, "Non supported extension text type for client.\n");
311 va_start (ap, new_format); 239 va_start (ap, new_format);
… …
320 248
321 va_start (ap, new_format); 249 va_start (ap, new_format);
322 vsnprintf (buf, HUGE_BUF, new_format, ap); 250 vsnprintf (buf, HUGE_BUF, new_format, ap);
323 va_end (ap); 251 va_end (ap);
324 strip_media_tag (buf); 252 strip_media_tag (buf);
325 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);
326 } 254 }
327} 255}
328 256
329/** 257/**
330 * 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.
331 */ 259 */
332 260
333void 261void
334new_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)
335{ 263{
336 player *pl; 264 for_all_players (pl)
337
338 for (pl = first_player; pl != NULL; pl = pl->next)
339 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 265 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
340 {
341 new_draw_info (color, 0, pl->ob, str); 266 new_draw_info (color, 0, pl->ob, str);
342 }
343} 267}
344 268
345/** 269/**
346 * Writes to everyone on the map except op1 and op2 270 * Writes to everyone on the map except op1 and op2
347 */ 271 */
348 272
349void 273void
350new_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)
351{ 275{
352 player *pl; 276 for_all_players (pl)
353
354 for (pl = first_player; pl != NULL; pl = pl->next)
355 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)
356 {
357 new_draw_info (color, 0, pl->ob, str); 278 new_draw_info (color, 0, pl->ob, str);
358 }
359} 279}
360 280
361/** 281/**
362 * Writes to everyone on the specified map 282 * Writes to everyone on the specified map
363 */ 283 */
364 284
365void 285void
366new_info_map (int color, maptile * map, const char *str) 286new_info_map (int color, maptile * map, const char *str)
367{ 287{
368 player *pl; 288 for_all_players (pl)
369
370 for (pl = first_player; pl != NULL; pl = pl->next)
371 if (pl->ob != NULL && pl->ob->map == map) 289 if (pl->ob != NULL && pl->ob->map == map)
372 {
373 new_draw_info (color, 0, pl->ob, str); 290 new_draw_info (color, 0, pl->ob, str);
374 }
375} 291}
376
377 292
378/** 293/**
379 * This does nothing now. However, in theory, we should probably send 294 * This does nothing now. However, in theory, we should probably send
380 * 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
381 * to handle this 296 * to handle this
382 */ 297 */
383void 298void
384clear_win_info (object *op) 299clear_win_info (object *op)
385{ 300{
386}
387
388/**
389 * Get player's current range attack in obuf.
390 */
391void
392rangetostring (object *pl, char *obuf)
393{
394 switch (pl->contr->shoottype)
395 {
396 case range_none:
397 strcpy (obuf, "Range: nothing");
398 break;
399
400 case range_bow:
401 {
402 object *op;
403
404 for (op = pl->inv; op; op = op->below)
405 if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED))
406 break;
407
408 if (op == NULL)
409 break;
410
411 sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing");
412 }
413 break;
414
415 case range_magic:
416 if (settings.casting_time == TRUE)
417 {
418 if (pl->casting_time > -1)
419 {
420 if (pl->casting_time == 0)
421 sprintf (obuf, "Range: Holding spell (%s)", &pl->spell->name);
422 else
423 sprintf (obuf, "Range: Casting spell (%s)", &pl->spell->name);
424 }
425 else
426 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
427 }
428 else
429 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
430 break;
431
432 case range_misc:
433 sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none");
434 break;
435
436 /* range_scroll is only used for controlling golems. If the
437 * the player does not have a golem, reset some things.
438 */
439 case range_golem:
440 if (pl->contr->ranges[range_golem] != NULL)
441 sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name);
442 else
443 {
444 pl->contr->shoottype = range_none;
445 strcpy (obuf, "Range: nothing");
446 }
447 break;
448
449 case range_skill:
450 sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none");
451 break;
452
453 case range_builder:
454 sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0));
455 break;
456
457 default:
458 strcpy (obuf, "Range: illegal");
459 }
460} 301}
461 302
462/** 303/**
463 * Sets player title. 304 * Sets player title.
464 */ 305 */
… …
470 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);
471 else 312 else
472 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);
473} 314}
474 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}
475 325
476/** 326/**
477 * Helper for magic map creation. 327 * Helper for magic map creation.
478 * 328 *
479 * 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.
… …
488magic_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)
489{ 339{
490 int x, y, dx, dy, mflags; 340 int x, y, dx, dy, mflags;
491 sint16 nx, ny; 341 sint16 nx, ny;
492 maptile *mp; 342 maptile *mp;
493 New_Face *f;
494 343
495 for (dx = -1; dx <= 1; dx++) 344 for (dx = -1; dx <= 1; dx++)
496 { 345 {
497 for (dy = -1; dy <= 1; dy++) 346 for (dy = -1; dy <= 1; dy++)
498 { 347 {
… …
510 if (mflags & P_OUT_OF_MAP) 359 if (mflags & P_OUT_OF_MAP)
511 continue; 360 continue;
512 361
513 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)
514 { 363 {
515 f = GET_MAP_FACE (mp, nx, ny, 0); 364 int f = GET_MAP_FACE (mp, nx, ny, 0);
516 if (f == blank_face) 365 if (f == blank_face)
366 {
517 f = GET_MAP_FACE (mp, nx, ny, 1); 367 f = GET_MAP_FACE (mp, nx, ny, 1);
518 if (f == blank_face) 368 if (f == blank_face)
519 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;
520 373
521 /* 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
522 * work. 375 * work.
523 */ 376 */
524 if (mflags & P_BLOCKSVIEW) 377 if (mflags & P_BLOCKSVIEW)
525 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;
526 else 379 else
527 { 380 {
528 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;
529 magic_mapping_mark_recursive (pl, map_mark, x, y); 382 magic_mapping_mark_recursive (pl, map_mark, x, y);
530 } 383 }
531 } 384 }
532 } 385 }
533 } 386 }
534} 387}
535 388
536
537/** 389/**
538 * Creates magic map for player. 390 * Creates magic map for player.
539 * 391 *
540 * Note: For improved magic mapping display, the space that blocks 392 * Note: For improved magic mapping display, the space that blocks
541 * 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
542 * being nonzero have been changed to check for 1. Also, since 394 * being nonzero have been changed to check for 1. Also, since
543 * 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.
544 * 396 *
545 * 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
546 * 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
547 * is for open spaces. map_mark should already have been initialized 399 * is for open spaces. map_mark should already have been initialised
548 * to zero before this is called. 400 * to zero before this is called.
549 * strength is an initial strength*2 rectangular area that we automatically 401 * strength is an initial strength*2 rectangular area that we automatically
550 * see in/penetrate through. 402 * see in/penetrate through.
551 */ 403 */
552
553void 404void
554magic_mapping_mark (object *pl, char *map_mark, int strength) 405magic_mapping_mark (object *pl, char *map_mark, int strength)
555{ 406{
556 int x, y, mflags; 407 int x, y, mflags;
557 sint16 nx, ny; 408 sint16 nx, ny;
558 maptile *mp; 409 maptile *mp;
559 New_Face *f;
560 410
561 for (x = -strength; x < strength; x++) 411 for (x = -strength; x < strength; x++)
562 { 412 {
563 for (y = -strength; y < strength; y++) 413 for (y = -strength; y < strength; y++)
564 { 414 {
565 mp = pl->map; 415 mp = pl->map;
566 nx = pl->x + x; 416 nx = pl->x + x;
567 ny = pl->y + y; 417 ny = pl->y + y;
418
568 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 419 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
569 if (mflags & P_OUT_OF_MAP) 420 if (mflags & P_OUT_OF_MAP)
570 continue; 421 continue;
571 else 422
423 int f = GET_MAP_FACE (mp, nx, ny, 0);
424 if (f == blank_face)
572 { 425 {
573 f = GET_MAP_FACE (mp, nx, ny, 0);
574 if (f == blank_face)
575 f = GET_MAP_FACE (mp, nx, ny, 1); 426 f = GET_MAP_FACE (mp, nx, ny, 1);
576 if (f == blank_face) 427 if (f == blank_face)
577 f = GET_MAP_FACE (mp, nx, ny, 2); 428 f = GET_MAP_FACE (mp, nx, ny, 2);
578 } 429 }
579 430
431 int magicmap = faces [f].magicmap;
432
580 if (mflags & P_BLOCKSVIEW) 433 if (mflags & P_BLOCKSVIEW)
581 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;
582 else 435 else
583 { 436 {
584 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;
585 magic_mapping_mark_recursive (pl, map_mark, x, y); 438 magic_mapping_mark_recursive (pl, map_mark, x, y);
586 } 439 }
587 } 440 }
588 } 441 }
589} 442}
590 443
591
592/** 444/**
593 * Creates and sends magic map to player. 445 * Creates and sends magic map to player.
594 * 446 *
595 * 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,
596 * but there is no real easy solution. 448 * but there is no real easy solution.
597 * 449 *
598 * Mark Wedel 450 * Mark Wedel
599 */ 451 */
600
601void 452void
602draw_magic_map (object *pl) 453draw_magic_map (object *pl)
603{ 454{
604 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);
605 int xmin, xmax, ymin, ymax; 456 int xmin, xmax, ymin, ymax;
… …
623 xmax = 0; 474 xmax = 0;
624 ymax = 0; 475 ymax = 0;
625 476
626 for (int x = 0; x < MAGIC_MAP_SIZE; x++) 477 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
627 for (int y = 0; y < MAGIC_MAP_SIZE; y++) 478 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
628 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 479 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
629 { 480 {
630 xmin = x < xmin ? x : xmin; 481 xmin = x < xmin ? x : xmin;
631 xmax = x > xmax ? x : xmax; 482 xmax = x > xmax ? x : xmax;
632 ymin = y < ymin ? y : ymin; 483 ymin = y < ymin ? y : ymin;
633 ymax = y > ymax ? y : ymax; 484 ymax = y > ymax ? y : ymax;
634 } 485 }
635 486
636 SockList sl (MAXSOCKBUF); 487 packet sl;
637 sl.printf ("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),
638 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); 489 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
639 490
640 for (int y = ymin; y <= ymax; y++) 491 for (int y = ymin; y <= ymax; y++)
641 for (int x = xmin; x <= xmax; x++) 492 for (int x = xmin; x <= xmax; x++)
642 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR); 493 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
643 494
644 Send_With_Handling (&pl->contr->socket, &sl); 495 pl->contr->ns->send_packet (sl);
645
646 sl.free ();
647 496
648 free (map_mark); 497 free (map_mark);
649} 498}
650 499
651
652/** 500/**
653 * Send a kill log record to sockets 501 * Send a kill log record to sockets
654 */ 502 */
655
656void 503void
657Log_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)
658{ 505{
659 size_t len; 506 size_t len;
660 char buf[MAX_BUF]; 507 char buf[MAX_BUF];
… …
664 else 511 else
665 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);
666 513
667 len = strlen (buf); 514 len = strlen (buf);
668} 515}
516

Diff Legend

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