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.16 by root, Thu Dec 14 02:37:37 2006 UTC vs.
Revision 1.47 by root, Thu Nov 8 19:43:29 2007 UTC

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

Diff Legend

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