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.6 by root, Thu Sep 14 22:34:05 2006 UTC vs.
Revision 1.50 by root, Tue May 6 16:55:26 2008 UTC

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

Diff Legend

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