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.5 by root, Sun Sep 10 13:43:33 2006 UTC vs.
Revision 1.45 by root, Sun Jun 24 04:09:29 2007 UTC

1
2/* 1/*
3 * static char *rcsid_sock_info_c = 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
4 * "$Id: info.C,v 1.5 2006/09/10 13:43:33 root Exp $"; 3 *
5 */ 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
6
7/*
8 CrossFire, A Multiplayer game for X-windows
9
10 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
11 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
12 7 *
13 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
14 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
15 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
16 (at your option) any later version. 11 * any later version.
17 12 *
18 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
19 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
21 GNU General Public License for more details. 16 * for more details.
22 17 *
23 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
24 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
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
26 21 *
27 The authors can be reached via e-mail at crossfire-devel@real-time.com 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
28*/ 23 */
29 24
30/** 25/**
31 * \file 26 * \file
32 * Basic client output functions. 27 * Basic client output functions.
33 * 28 *
… …
41#include <sproto.h> 36#include <sproto.h>
42#include <stdarg.h> 37#include <stdarg.h>
43#include <spells.h> 38#include <spells.h>
44#include <skills.h> 39#include <skills.h>
45 40
41#include <cstring>
42
46/** 43/**
47 * Draws a normal message on the client. It is pretty 44 * Draws a normal message on the client. It is pretty
48 * 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
49 * parameter. the esrv_drawinfo functions should probably be 46 * parameter. the esrv_drawinfo functions should probably be
50 * replaced with this, just using black as the color. 47 * replaced with this, just using black as the color.
51 */ 48 */
52static void 49static void
53esrv_print_msg (NewSocket * ns, int color, const char *str) 50esrv_print_msg (client *ns, int color, const char *str)
54{ 51{
55 char buf[HUGE_BUF]; 52 ns->send_msg (color, "info", str);
56
57 if (ns->status == Ns_Old)
58 {
59 snprintf (buf, HUGE_BUF, "%s\n", str);
60 }
61 else
62 {
63 snprintf (buf, HUGE_BUF, "drawinfo %d %s", color, str);
64 }
65
66/* LOG(llevDebug,"sending %s to socket, len=%d\n", buf, strlen(buf));*/
67 Write_String_To_Socket (ns, buf, strlen (buf));
68} 53}
69 54
70/** 55/**
71 * Draws an extended message on the client. 56 * Draws an extended message on the client.
72 * ns the socket to send message to 57 * ns the socket to send message to
… …
75 * subtype type and subtype of text message 60 * subtype type and subtype of text message
76 * 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
77 * message The main message 62 * message The main message
78 */ 63 */
79static void 64static void
80esrv_print_ext_msg (NewSocket * ns, int color, uint8 type, uint8 subtype, const char *message) 65esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message)
81{ 66{
82 char buf[HUGE_BUF];
83
84 snprintf (buf, HUGE_BUF, "drawextinfo %d %hhu %hhu %s", color, type, subtype, message); 67 ns->send_packet_printf ("drawextinfo %d %u %u %s", color, type, subtype, message);
85 Write_String_To_Socket (ns, buf, strlen (buf));
86
87/* LOG(llevDebug,"sending %s to socket, len=%d", buf, strlen(buf));*/
88
89} 68}
90 69
91/** 70/**
92 * Frontend for esrv_print_msg 71 * Frontend for esrv_print_msg
93 * \param colr message color 72 * \param colr message color
… …
96 * 75 *
97 * 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.
98 * 77 *
99 * Else sends message to player via esrv_print_msg 78 * Else sends message to player via esrv_print_msg
100 */ 79 */
101
102static void 80static void
103print_message (int colr, const object *pl, const char *tmp) 81print_message (int colr, const object *pl, const char *tmp)
104{ 82{
105 83 if (!tmp)
106 if (tmp == (char *) NULL)
107 {
108 tmp = "[NULL]"; 84 tmp = "[NULL]";
109 }
110 85
111 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 86 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
112 return; 87 return;
113 88
114 if (pl->type == PLAYER) 89 if (pl->type == PLAYER)
115 {
116 esrv_print_msg (&pl->contr->socket, colr, (char *) tmp); 90 esrv_print_msg (pl->contr->ns, colr, (char *)tmp);
117 return; 91}
92
93bool
94client::msg_suppressed (const char *msg)
95{
96 if (!pl)
97 return false;
98
99 if (pl->outputs_count <= 1 || !pl->outputs_sync)
100 return false;
101
102 int len = strlen (msg);
103
104 if (len > MSG_BUF_SIZE)
105 return false;
106
107 msg_buf *lru = msgbuf;
108 for (msg_buf *buf = msgbuf; buf < msgbuf + MSG_BUF_COUNT; ++buf)
118 } 109 {
119} 110 if (len == buf->len && !memcmp (msg, buf->msg, len))
120
121
122/**
123 * Prints out the contents of specified buffer structures,
124 * and clears the string.
125 */
126
127void
128flush_output_element (const object *pl, Output_Buf * outputs)
129{
130 char tbuf[MAX_BUF];
131
132 if (outputs->buf == NULL)
133 return;
134 if (outputs->count > 1)
135 {
136 snprintf (tbuf, MAX_BUF, "%d times %s", outputs->count, &outputs->buf);
137 print_message (NDI_BLACK, pl, tbuf);
138 }
139 else
140 print_message (NDI_BLACK, pl, &outputs->buf);
141
142 outputs->buf = NULL;
143 outputs->first_update = 0; /* This way, it will be reused */
144}
145
146/**
147 * Sends message to player through output buffers.
148 * \param pl player to send message
149 * \param buf message to send
150 *
151 * If player's output_count is 1, sends message directly.
152 *
153 * Else checks output buffers for specified message.
154 *
155 * If found, checks if message should be sent now.
156 *
157 * If message not already in buffers, flushes olders buffer,
158 * and adds message to queue.
159 */
160
161static void
162check_output_buffers (const object *pl, const char *buf)
163{
164 int i, oldest = 0;
165
166 if (pl->contr->outputs_count < 2)
167 {
168 print_message (NDI_BLACK, pl, buf);
169 return;
170 }
171 else
172 {
173 for (i = 0; i < NUM_OUTPUT_BUFS; i++)
174 { 111 {
175 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)
176 break; 114 {
177 else if (pl->contr->outputs[i].first_update < pl->contr->outputs[oldest].first_update) 115 // yes, take over matching buffer, print
178 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;
179 } 125 }
180 /* We found a match */
181 if (i < NUM_OUTPUT_BUFS)
182 {
183 pl->contr->outputs[i].count++;
184 if (pl->contr->outputs[i].count >= pl->contr->outputs_count)
185 {
186 flush_output_element (pl, &pl->contr->outputs[i]);
187 }
188 }
189 /* No match - flush the oldest, and put the new one in */
190 else
191 {
192 flush_output_element (pl, &pl->contr->outputs[oldest]);
193 126
194 pl->contr->outputs[oldest].first_update = pticks; 127 if (lru->expire > buf->expire)
195 pl->contr->outputs[oldest].count = 1; 128 lru = buf;
196 pl->contr->outputs[oldest].buf = buf;
197 }
198 } 129 }
199}
200 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);
201 136
137 return false;
138}
202 139
203/** 140/**
204 * Sends message to player(s). 141 * Sends message to player(s).
205 * 142 *
206 * flags is various flags - mostly color, plus a few specials. 143 * flags is various flags - mostly color, plus a few specials.
… …
214 * in the flags. 151 * in the flags.
215 * 152 *
216 * 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.
217 * 154 *
218 */ 155 */
219
220void 156void
221new_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)
222{ 158{
223
224 if (flags & NDI_ALL) 159 if (flags & NDI_ALL)
225 { 160 {
226 player *tmppl; 161 for_all_players (pl)
227 int i;
228
229 for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
230 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); 162 new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
231
232 for (i = 1; i < socket_info.allocated_sockets; i++)
233 {
234 if (init_sockets[i].status == Ns_Old && init_sockets[i].old_mode != Old_Listen && pri < 10)
235 {
236 cs_write_string (&init_sockets[i], buf, strlen (buf));
237 /* Most messages don't have a newline, so add one */
238 cs_write_string (&init_sockets[i], "\n", 1);
239 }
240 }
241
242 return;
243 }
244 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
245 {
246 /* Write to the socket? */
247 print_message (0, NULL, buf);
248 return;
249 }
250 if (pl->type != PLAYER)
251 return;
252 if (pri >= pl->contr->listening)
253 return;
254
255 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE))
256 {
257 /* following prints stuff out, as appropriate */
258 check_output_buffers (pl, buf);
259 } 163 }
260 else 164 else
261 { 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))
262 print_message (flags & NDI_COLOR_MASK, pl, buf); 174 print_message (flags & NDI_COLOR_MASK, op, buf);
263 } 175 }
264} 176}
265 177
266/** 178/**
267 * Wrapper for new_draw_info printf-like. 179 * Wrapper for new_draw_info printf-like.
… …
269 * 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
270 * 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
271 * 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
272 * client/server bandwidth (client could keep track of various strings 184 * client/server bandwidth (client could keep track of various strings
273 */ 185 */
274
275void 186void
276new_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, ...)
277{ 188{
278 char buf[HUGE_BUF]; 189 char buf[HUGE_BUF];
279 190
280 va_list ap; 191 va_list ap;
281
282 va_start (ap, format); 192 va_start (ap, format);
283
284 vsnprintf (buf, HUGE_BUF, format, ap); 193 vsnprintf (buf, HUGE_BUF, format, ap);
285
286 va_end (ap); 194 va_end (ap);
287 195
288 new_draw_info (flags, pri, pl, buf); 196 new_draw_info (flags, pri, pl, buf);
289} 197}
290
291 198
292void 199void
293draw_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)
294{ 201{
295 202
296 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 203 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
297 return; 204 return;
298 205
299 if (pri >= pl->contr->listening) 206 if (pri >= pl->contr->listening)
300 return; 207 return;
208
301 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 209 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
302 { 210 {
303 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 211 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
304 212
305 if (buf == NULL) 213 if (buf == NULL)
306 LOG (llevError, "info::draw_ext_info -> Out of memory!"); 214 LOG (llevError, "info::draw_ext_info -> Out of memory!");
… …
311 new_draw_info (flags, pri, pl, buf); 219 new_draw_info (flags, pri, pl, buf);
312 free (buf); 220 free (buf);
313 } 221 }
314 } 222 }
315 else 223 else
316 {
317 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);
318 }
319} 225}
320 226
321void 227void
322draw_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, ...)
323{ 229{
324
325 char buf[HUGE_BUF]; 230 char buf[HUGE_BUF];
326 231
327 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 232 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
328 return; 233 return;
329 234
330 if (pri >= pl->contr->listening) 235 if (pri >= pl->contr->listening)
331 return; 236 return;
237
332 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 238 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
333 { 239 {
334 va_list ap; 240 va_list ap;
335 241
336 LOG (llevDebug, "Non supported extension text type for client.\n"); 242 LOG (llevDebug, "Non supported extension text type for client.\n");
337 va_start (ap, new_format); 243 va_start (ap, new_format);
… …
346 252
347 va_start (ap, new_format); 253 va_start (ap, new_format);
348 vsnprintf (buf, HUGE_BUF, new_format, ap); 254 vsnprintf (buf, HUGE_BUF, new_format, ap);
349 va_end (ap); 255 va_end (ap);
350 strip_media_tag (buf); 256 strip_media_tag (buf);
351 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);
352 } 258 }
353} 259}
354 260
355/** 261/**
356 * 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.
357 */ 263 */
358 264
359void 265void
360new_info_map_except (int color, mapstruct *map, object *op, const char *str) 266new_info_map_except (int color, maptile * map, object *op, const char *str)
361{ 267{
362 player *pl; 268 for_all_players (pl)
363
364 for (pl = first_player; pl != NULL; pl = pl->next)
365 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 269 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
366 {
367 new_draw_info (color, 0, pl->ob, str); 270 new_draw_info (color, 0, pl->ob, str);
368 }
369} 271}
370 272
371/** 273/**
372 * Writes to everyone on the map except op1 and op2 274 * Writes to everyone on the map except op1 and op2
373 */ 275 */
374
375void 276void
376new_info_map_except2 (int color, mapstruct *map, object *op1, object *op2, const char *str) 277new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
377{ 278{
378 player *pl; 279 for_all_players (pl)
379
380 for (pl = first_player; pl != NULL; pl = pl->next)
381 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)
382 {
383 new_draw_info (color, 0, pl->ob, str); 281 new_draw_info (color, 0, pl->ob, str);
384 }
385} 282}
386 283
387/** 284/**
388 * Writes to everyone on the specified map 285 * Writes to everyone on the specified map
389 */ 286 */
390
391void 287void
392new_info_map (int color, mapstruct *map, const char *str) 288new_info_map (int color, maptile * map, const char *str)
393{ 289{
394 player *pl; 290 for_all_players (pl)
395
396 for (pl = first_player; pl != NULL; pl = pl->next)
397 if (pl->ob != NULL && pl->ob->map == map) 291 if (pl->ob != NULL && pl->ob->map == map)
398 {
399 new_draw_info (color, 0, pl->ob, str); 292 new_draw_info (color, 0, pl->ob, str);
400 }
401}
402
403
404/**
405 * This does nothing now. However, in theory, we should probably send
406 * something to the client and let the client figure out how it might want
407 * to handle this
408 */
409void
410clear_win_info (object *op)
411{
412}
413
414/**
415 * Get player's current range attack in obuf.
416 */
417void
418rangetostring (object *pl, char *obuf)
419{
420 switch (pl->contr->shoottype)
421 {
422 case range_none:
423 strcpy (obuf, "Range: nothing");
424 break;
425
426 case range_bow:
427 {
428 object *op;
429
430 for (op = pl->inv; op; op = op->below)
431 if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED))
432 break;
433 if (op == NULL)
434 break;
435
436 sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing");
437 }
438 break;
439
440 case range_magic:
441 if (settings.casting_time == TRUE)
442 {
443 if (pl->casting_time > -1)
444 {
445 if (pl->casting_time == 0)
446 sprintf (obuf, "Range: Holding spell (%s)", (const char *) pl->spell->name);
447 else
448 sprintf (obuf, "Range: Casting spell (%s)", (const char *) pl->spell->name);
449 }
450 else
451 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
452 }
453 else
454 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
455 break;
456
457 case range_misc:
458 sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none");
459 break;
460
461 /* range_scroll is only used for controlling golems. If the
462 * the player does not have a golem, reset some things.
463 */
464 case range_golem:
465 if (pl->contr->ranges[range_golem] != NULL)
466 sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name);
467 else
468 {
469 pl->contr->shoottype = range_none;
470 strcpy (obuf, "Range: nothing");
471 }
472 break;
473
474 case range_skill:
475 sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none");
476 break;
477
478 case range_builder:
479 sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0));
480 break;
481
482 default:
483 strcpy (obuf, "Range: illegal");
484 }
485} 293}
486 294
487/** 295/**
488 * Sets player title. 296 * Sets player title.
489 */ 297 */
… …
495 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);
496 else 304 else
497 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);
498} 306}
499 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}
500 317
501/** 318/**
502 * Helper for magic map creation. 319 * Helper for magic map creation.
503 * 320 *
504 * 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.
… …
512static void 329static void
513magic_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)
514{ 331{
515 int x, y, dx, dy, mflags; 332 int x, y, dx, dy, mflags;
516 sint16 nx, ny; 333 sint16 nx, ny;
517 mapstruct *mp; 334 maptile *mp;
518 New_Face *f;
519 335
520 for (dx = -1; dx <= 1; dx++) 336 for (dx = -1; dx <= 1; dx++)
521 { 337 {
522 for (dy = -1; dy <= 1; dy++) 338 for (dy = -1; dy <= 1; dy++)
523 { 339 {
… …
535 if (mflags & P_OUT_OF_MAP) 351 if (mflags & P_OUT_OF_MAP)
536 continue; 352 continue;
537 353
538 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)
539 { 355 {
540 f = GET_MAP_FACE (mp, nx, ny, 0); 356 int f = GET_MAP_FACE (mp, nx, ny, 0);
541 if (f == blank_face) 357 if (f == blank_face)
358 {
542 f = GET_MAP_FACE (mp, nx, ny, 1); 359 f = GET_MAP_FACE (mp, nx, ny, 1);
543 if (f == blank_face) 360 if (f == blank_face)
544 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;
545 365
546 /* 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
547 * work. 367 * work.
548 */ 368 */
549 if (mflags & P_BLOCKSVIEW) 369 if (mflags & P_BLOCKSVIEW)
550 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;
551 else 371 else
552 { 372 {
553 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;
554 magic_mapping_mark_recursive (pl, map_mark, x, y); 374 magic_mapping_mark_recursive (pl, map_mark, x, y);
555 } 375 }
556 } 376 }
557 } 377 }
558 } 378 }
559} 379}
560 380
561
562/** 381/**
563 * Creates magic map for player. 382 * Creates magic map for player.
564 * 383 *
565 * Note: For improved magic mapping display, the space that blocks 384 * Note: For improved magic mapping display, the space that blocks
566 * 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
567 * being nonzero have been changed to check for 1. Also, since 386 * being nonzero have been changed to check for 1. Also, since
568 * 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.
569 * 388 *
570 * 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
571 * 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
572 * is for open spaces. map_mark should already have been initialized 391 * is for open spaces. map_mark should already have been initialised
573 * to zero before this is called. 392 * to zero before this is called.
574 * strength is an initial strength*2 rectangular area that we automatically 393 * strength is an initial strength*2 rectangular area that we automatically
575 * see in/penetrate through. 394 * see in/penetrate through.
576 */ 395 */
577
578void 396void
579magic_mapping_mark (object *pl, char *map_mark, int strength) 397magic_mapping_mark (object *pl, char *map_mark, int strength)
580{ 398{
581 int x, y, mflags; 399 int x, y, mflags;
582 sint16 nx, ny; 400 sint16 nx, ny;
583 mapstruct *mp; 401 maptile *mp;
584 New_Face *f;
585 402
586 for (x = -strength; x < strength; x++) 403 for (x = -strength; x < strength; x++)
587 { 404 {
588 for (y = -strength; y < strength; y++) 405 for (y = -strength; y < strength; y++)
589 { 406 {
590 mp = pl->map; 407 mp = pl->map;
591 nx = pl->x + x; 408 nx = pl->x + x;
592 ny = pl->y + y; 409 ny = pl->y + y;
410
593 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 411 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
594 if (mflags & P_OUT_OF_MAP) 412 if (mflags & P_OUT_OF_MAP)
595 continue; 413 continue;
596 else 414
415 int f = GET_MAP_FACE (mp, nx, ny, 0);
416 if (f == blank_face)
597 { 417 {
598 f = GET_MAP_FACE (mp, nx, ny, 0);
599 if (f == blank_face)
600 f = GET_MAP_FACE (mp, nx, ny, 1); 418 f = GET_MAP_FACE (mp, nx, ny, 1);
601 if (f == blank_face) 419 if (f == blank_face)
602 f = GET_MAP_FACE (mp, nx, ny, 2); 420 f = GET_MAP_FACE (mp, nx, ny, 2);
603 } 421 }
604 422
423 int magicmap = faces [f].magicmap;
424
605 if (mflags & P_BLOCKSVIEW) 425 if (mflags & P_BLOCKSVIEW)
606 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;
607 else 427 else
608 { 428 {
609 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;
610 magic_mapping_mark_recursive (pl, map_mark, x, y); 430 magic_mapping_mark_recursive (pl, map_mark, x, y);
611 } 431 }
612 } 432 }
613 } 433 }
614} 434}
615 435
616
617/** 436/**
618 * Creates and sends magic map to player. 437 * Creates and sends magic map to player.
619 * 438 *
620 * 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,
621 * but there is no real easy solution. 440 * but there is no real easy solution.
622 * 441 *
623 * Mark Wedel 442 * Mark Wedel
624 */ 443 */
625
626void 444void
627draw_magic_map (object *pl) 445draw_magic_map (object *pl)
628{ 446{
629 int x, y;
630 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);
631 int xmin, xmax, ymin, ymax; 448 int xmin, xmax, ymin, ymax;
632 SockList sl;
633 449
634 if (pl->type != PLAYER) 450 if (pl->type != PLAYER)
635 { 451 {
636 LOG (llevError, "Non player object called draw_map.\n"); 452 LOG (llevError, "Non player object called draw_map.\n");
637 return; 453 return;
… …
647 */ 463 */
648 xmin = MAGIC_MAP_SIZE; 464 xmin = MAGIC_MAP_SIZE;
649 ymin = MAGIC_MAP_SIZE; 465 ymin = MAGIC_MAP_SIZE;
650 xmax = 0; 466 xmax = 0;
651 ymax = 0; 467 ymax = 0;
468
652 for (x = 0; x < MAGIC_MAP_SIZE; x++) 469 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
653 {
654 for (y = 0; y < MAGIC_MAP_SIZE; y++) 470 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
471 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
655 { 472 {
656 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR)
657 {
658 xmin = x < xmin ? x : xmin; 473 xmin = x < xmin ? x : xmin;
659 xmax = x > xmax ? x : xmax; 474 xmax = x > xmax ? x : xmax;
660 ymin = y < ymin ? y : ymin; 475 ymin = y < ymin ? y : ymin;
661 ymax = y > ymax ? y : ymax; 476 ymax = y > ymax ? y : ymax;
662 }
663 } 477 }
664 }
665 478
666 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 479 packet sl;
667 snprintf ((char *) sl.buf, MAXSOCKBUF, "magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1), 480 sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),
668 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); 481 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
669 sl.len = strlen ((char *) sl.buf);
670 482
671 for (y = ymin; y <= ymax; y++) 483 for (int y = ymin; y <= ymax; y++)
672 {
673 for (x = xmin; x <= xmax; x++) 484 for (int x = xmin; x <= xmax; x++)
674 {
675 sl.buf[sl.len++] = map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR; 485 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
676 } /* x loop */
677 } /* y loop */
678 486
679 Send_With_Handling (&pl->contr->socket, &sl); 487 pl->contr->ns->send_packet (sl);
680 free (sl.buf); 488
681 free (map_mark); 489 free (map_mark);
682} 490}
683 491
684
685/** 492/**
686 * Send a kill log record to sockets 493 * Send a kill log record to sockets
687 */ 494 */
688
689void 495void
690Log_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)
691{ 497{
692 int i;
693 size_t len; 498 size_t len;
694 char buf[MAX_BUF]; 499 char buf[MAX_BUF];
695 500
696 if (With != NULL) 501 if (With != NULL)
697 {
698 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType); 502 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType);
699 }
700 else 503 else
701 {
702 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);
703 } 505
704 len = strlen (buf); 506 len = strlen (buf);
705 for (i = 1; i < socket_info.allocated_sockets; i++)
706 {
707 if (init_sockets[i].old_mode == Old_Listen)
708 {
709 cs_write_string (&init_sockets[i], buf, len);
710 }
711 }
712} 507}
508

Diff Legend

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