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

Diff Legend

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