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

Diff Legend

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