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.46 by root, Sun Jul 1 05:00:20 2007 UTC

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

Diff Legend

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