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.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 SockList sl (MAXSOCKBUF); 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 sl.free ();
59} 53}
60 54
61/** 55/**
62 * Draws an extended message on the client. 56 * Draws an extended message on the client.
63 * ns the socket to send message to 57 * ns the socket to send message to
… …
66 * subtype type and subtype of text message 60 * subtype type and subtype of text message
67 * 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
68 * message The main message 62 * message The main message
69 */ 63 */
70static void 64static void
71esrv_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)
72{ 66{
73 SockList sl (MAXSOCKBUF);
74
75 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);
76 ns->send_packet (sl);
77 sl.free ();
78} 68}
79 69
80/** 70/**
81 * Frontend for esrv_print_msg 71 * Frontend for esrv_print_msg
82 * \param colr message color 72 * \param colr message color
… …
85 * 75 *
86 * 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.
87 * 77 *
88 * Else sends message to player via esrv_print_msg 78 * Else sends message to player via esrv_print_msg
89 */ 79 */
90
91static void 80static void
92print_message (int colr, const object *pl, const char *tmp) 81print_message (int colr, const object *pl, const char *tmp)
93{ 82{
94
95 if (!tmp) 83 if (!tmp)
96 tmp = "[NULL]"; 84 tmp = "[NULL]";
97 85
98 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 86 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
99 return; 87 return;
100 88
101 if (pl->type == PLAYER) 89 if (pl->type == PLAYER)
102 {
103 esrv_print_msg (&pl->contr->socket, colr, (char *) tmp); 90 esrv_print_msg (pl->contr->ns, colr, (char *)tmp);
104 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)
105 } 109 {
106} 110 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 { 111 {
161 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)
162 break; 114 {
163 else if (pl->contr->outputs[i].first_update < pl->contr->outputs[oldest].first_update) 115 // yes, take over matching buffer, print
164 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;
165 } 125 }
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 126
180 pl->contr->outputs[oldest].first_update = pticks; 127 if (lru->expire > buf->expire)
181 pl->contr->outputs[oldest].count = 1; 128 lru = buf;
182 pl->contr->outputs[oldest].buf = buf;
183 }
184 } 129 }
185}
186 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);
187 136
137 return false;
138}
188 139
189/** 140/**
190 * Sends message to player(s). 141 * Sends message to player(s).
191 * 142 *
192 * flags is various flags - mostly color, plus a few specials. 143 * flags is various flags - mostly color, plus a few specials.
… …
200 * in the flags. 151 * in the flags.
201 * 152 *
202 * 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.
203 * 154 *
204 */ 155 */
205
206void 156void
207new_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)
208{ 158{
209
210 if (flags & NDI_ALL) 159 if (flags & NDI_ALL)
211 { 160 {
212 player *tmppl; 161 for_all_players (pl)
213
214 for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
215 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); 162 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 { 163 }
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 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))
237 print_message (flags & NDI_COLOR_MASK, pl, buf); 174 print_message (flags & NDI_COLOR_MASK, op, buf);
175 }
238} 176}
239 177
240/** 178/**
241 * Wrapper for new_draw_info printf-like. 179 * Wrapper for new_draw_info printf-like.
242 * 180 *
243 * 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
244 * 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
245 * 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
246 * client/server bandwidth (client could keep track of various strings 184 * client/server bandwidth (client could keep track of various strings
247 */ 185 */
248
249void 186void
250new_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, ...)
251{ 188{
252 char buf[HUGE_BUF]; 189 char buf[HUGE_BUF];
253 190
254 va_list ap; 191 va_list ap;
255
256 va_start (ap, format); 192 va_start (ap, format);
257
258 vsnprintf (buf, HUGE_BUF, format, ap); 193 vsnprintf (buf, HUGE_BUF, format, ap);
259
260 va_end (ap); 194 va_end (ap);
261 195
262 new_draw_info (flags, pri, pl, buf); 196 new_draw_info (flags, pri, pl, buf);
263} 197}
264
265 198
266void 199void
267draw_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)
268{ 201{
269 202
270 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 203 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
271 return; 204 return;
272 205
273 if (pri >= pl->contr->listening) 206 if (pri >= pl->contr->listening)
274 return; 207 return;
208
275 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 209 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
276 { 210 {
277 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 211 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
278 212
279 if (buf == NULL) 213 if (buf == NULL)
280 LOG (llevError, "info::draw_ext_info -> Out of memory!"); 214 LOG (llevError, "info::draw_ext_info -> Out of memory!");
… …
285 new_draw_info (flags, pri, pl, buf); 219 new_draw_info (flags, pri, pl, buf);
286 free (buf); 220 free (buf);
287 } 221 }
288 } 222 }
289 else 223 else
290 {
291 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);
292 }
293} 225}
294 226
295void 227void
296draw_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, ...)
297{ 229{
298
299 char buf[HUGE_BUF]; 230 char buf[HUGE_BUF];
300 231
301 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 232 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
302 return; 233 return;
303 234
304 if (pri >= pl->contr->listening) 235 if (pri >= pl->contr->listening)
305 return; 236 return;
237
306 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 238 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
307 { 239 {
308 va_list ap; 240 va_list ap;
309 241
310 LOG (llevDebug, "Non supported extension text type for client.\n"); 242 LOG (llevDebug, "Non supported extension text type for client.\n");
311 va_start (ap, new_format); 243 va_start (ap, new_format);
… …
320 252
321 va_start (ap, new_format); 253 va_start (ap, new_format);
322 vsnprintf (buf, HUGE_BUF, new_format, ap); 254 vsnprintf (buf, HUGE_BUF, new_format, ap);
323 va_end (ap); 255 va_end (ap);
324 strip_media_tag (buf); 256 strip_media_tag (buf);
325 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);
326 } 258 }
327} 259}
328 260
329/** 261/**
330 * 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.
331 */ 263 */
332 264
333void 265void
334new_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)
335{ 267{
336 player *pl; 268 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) 269 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
340 {
341 new_draw_info (color, 0, pl->ob, str); 270 new_draw_info (color, 0, pl->ob, str);
342 }
343} 271}
344 272
345/** 273/**
346 * Writes to everyone on the map except op1 and op2 274 * Writes to everyone on the map except op1 and op2
347 */ 275 */
348
349void 276void
350new_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)
351{ 278{
352 player *pl; 279 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) 280 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
356 {
357 new_draw_info (color, 0, pl->ob, str); 281 new_draw_info (color, 0, pl->ob, str);
358 }
359} 282}
360 283
361/** 284/**
362 * Writes to everyone on the specified map 285 * Writes to everyone on the specified map
363 */ 286 */
364
365void 287void
366new_info_map (int color, maptile * map, const char *str) 288new_info_map (int color, maptile * map, const char *str)
367{ 289{
368 player *pl; 290 for_all_players (pl)
369
370 for (pl = first_player; pl != NULL; pl = pl->next)
371 if (pl->ob != NULL && pl->ob->map == map) 291 if (pl->ob != NULL && pl->ob->map == map)
372 {
373 new_draw_info (color, 0, pl->ob, str); 292 new_draw_info (color, 0, pl->ob, str);
374 }
375}
376
377
378/**
379 * 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
381 * to handle this
382 */
383void
384clear_win_info (object *op)
385{
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} 293}
461 294
462/** 295/**
463 * Sets player title. 296 * Sets player title.
464 */ 297 */
… …
470 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);
471 else 304 else
472 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);
473} 306}
474 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}
475 317
476/** 318/**
477 * Helper for magic map creation. 319 * Helper for magic map creation.
478 * 320 *
479 * 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.
… …
488magic_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)
489{ 331{
490 int x, y, dx, dy, mflags; 332 int x, y, dx, dy, mflags;
491 sint16 nx, ny; 333 sint16 nx, ny;
492 maptile *mp; 334 maptile *mp;
493 New_Face *f;
494 335
495 for (dx = -1; dx <= 1; dx++) 336 for (dx = -1; dx <= 1; dx++)
496 { 337 {
497 for (dy = -1; dy <= 1; dy++) 338 for (dy = -1; dy <= 1; dy++)
498 { 339 {
… …
510 if (mflags & P_OUT_OF_MAP) 351 if (mflags & P_OUT_OF_MAP)
511 continue; 352 continue;
512 353
513 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)
514 { 355 {
515 f = GET_MAP_FACE (mp, nx, ny, 0); 356 int f = GET_MAP_FACE (mp, nx, ny, 0);
516 if (f == blank_face) 357 if (f == blank_face)
358 {
517 f = GET_MAP_FACE (mp, nx, ny, 1); 359 f = GET_MAP_FACE (mp, nx, ny, 1);
518 if (f == blank_face) 360 if (f == blank_face)
519 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;
520 365
521 /* 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
522 * work. 367 * work.
523 */ 368 */
524 if (mflags & P_BLOCKSVIEW) 369 if (mflags & P_BLOCKSVIEW)
525 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;
526 else 371 else
527 { 372 {
528 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;
529 magic_mapping_mark_recursive (pl, map_mark, x, y); 374 magic_mapping_mark_recursive (pl, map_mark, x, y);
530 } 375 }
531 } 376 }
532 } 377 }
533 } 378 }
534} 379}
535 380
536
537/** 381/**
538 * Creates magic map for player. 382 * Creates magic map for player.
539 * 383 *
540 * Note: For improved magic mapping display, the space that blocks 384 * Note: For improved magic mapping display, the space that blocks
541 * 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
542 * being nonzero have been changed to check for 1. Also, since 386 * 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. 387 * map_mark is a char value, putting 2 in should cause no problems.
544 * 388 *
545 * 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
546 * 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
547 * is for open spaces. map_mark should already have been initialized 391 * is for open spaces. map_mark should already have been initialised
548 * to zero before this is called. 392 * to zero before this is called.
549 * strength is an initial strength*2 rectangular area that we automatically 393 * strength is an initial strength*2 rectangular area that we automatically
550 * see in/penetrate through. 394 * see in/penetrate through.
551 */ 395 */
552
553void 396void
554magic_mapping_mark (object *pl, char *map_mark, int strength) 397magic_mapping_mark (object *pl, char *map_mark, int strength)
555{ 398{
556 int x, y, mflags; 399 int x, y, mflags;
557 sint16 nx, ny; 400 sint16 nx, ny;
558 maptile *mp; 401 maptile *mp;
559 New_Face *f;
560 402
561 for (x = -strength; x < strength; x++) 403 for (x = -strength; x < strength; x++)
562 { 404 {
563 for (y = -strength; y < strength; y++) 405 for (y = -strength; y < strength; y++)
564 { 406 {
565 mp = pl->map; 407 mp = pl->map;
566 nx = pl->x + x; 408 nx = pl->x + x;
567 ny = pl->y + y; 409 ny = pl->y + y;
410
568 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 411 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
569 if (mflags & P_OUT_OF_MAP) 412 if (mflags & P_OUT_OF_MAP)
570 continue; 413 continue;
571 else 414
415 int f = GET_MAP_FACE (mp, nx, ny, 0);
416 if (f == blank_face)
572 { 417 {
573 f = GET_MAP_FACE (mp, nx, ny, 0);
574 if (f == blank_face)
575 f = GET_MAP_FACE (mp, nx, ny, 1); 418 f = GET_MAP_FACE (mp, nx, ny, 1);
576 if (f == blank_face) 419 if (f == blank_face)
577 f = GET_MAP_FACE (mp, nx, ny, 2); 420 f = GET_MAP_FACE (mp, nx, ny, 2);
578 } 421 }
579 422
423 int magicmap = faces [f].magicmap;
424
580 if (mflags & P_BLOCKSVIEW) 425 if (mflags & P_BLOCKSVIEW)
581 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;
582 else 427 else
583 { 428 {
584 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;
585 magic_mapping_mark_recursive (pl, map_mark, x, y); 430 magic_mapping_mark_recursive (pl, map_mark, x, y);
586 } 431 }
587 } 432 }
588 } 433 }
589} 434}
590 435
591
592/** 436/**
593 * Creates and sends magic map to player. 437 * Creates and sends magic map to player.
594 * 438 *
595 * 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,
596 * but there is no real easy solution. 440 * but there is no real easy solution.
597 * 441 *
598 * Mark Wedel 442 * Mark Wedel
599 */ 443 */
600
601void 444void
602draw_magic_map (object *pl) 445draw_magic_map (object *pl)
603{ 446{
604 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);
605 int xmin, xmax, ymin, ymax; 448 int xmin, xmax, ymin, ymax;
… …
623 xmax = 0; 466 xmax = 0;
624 ymax = 0; 467 ymax = 0;
625 468
626 for (int x = 0; x < MAGIC_MAP_SIZE; x++) 469 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
627 for (int y = 0; y < MAGIC_MAP_SIZE; y++) 470 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
628 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 471 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
629 { 472 {
630 xmin = x < xmin ? x : xmin; 473 xmin = x < xmin ? x : xmin;
631 xmax = x > xmax ? x : xmax; 474 xmax = x > xmax ? x : xmax;
632 ymin = y < ymin ? y : ymin; 475 ymin = y < ymin ? y : ymin;
633 ymax = y > ymax ? y : ymax; 476 ymax = y > ymax ? y : ymax;
634 } 477 }
635 478
636 SockList sl (MAXSOCKBUF); 479 packet sl;
637 sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1), 480 sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),
638 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); 481 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
639 482
640 for (int y = ymin; y <= ymax; y++) 483 for (int y = ymin; y <= ymax; y++)
641 for (int x = xmin; x <= xmax; x++) 484 for (int x = xmin; x <= xmax; x++)
642 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR); 485 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
643 486
644 Send_With_Handling (&pl->contr->socket, &sl); 487 pl->contr->ns->send_packet (sl);
645
646 sl.free ();
647 488
648 free (map_mark); 489 free (map_mark);
649} 490}
650 491
651
652/** 492/**
653 * Send a kill log record to sockets 493 * Send a kill log record to sockets
654 */ 494 */
655
656void 495void
657Log_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)
658{ 497{
659 size_t len; 498 size_t len;
660 char buf[MAX_BUF]; 499 char buf[MAX_BUF];
… …
664 else 503 else
665 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);
666 505
667 len = strlen (buf); 506 len = strlen (buf);
668} 507}
508

Diff Legend

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