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.15 by root, Thu Dec 14 01:21:58 2006 UTC vs.
Revision 1.45 by root, Sun Jun 24 04:09:29 2007 UTC

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

Diff Legend

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