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

1
2/* 1/*
3 * static char *rcsid_sock_info_c = 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
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
14 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
15 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
16 (at your option) any later version. 11 * (at your option) 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,
19 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21 GNU General Public License for more details. 16 * GNU General Public License 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
24 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
26 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
27 The authors can be reached via e-mail at crossfire-devel@real-time.com
28*/ 22 */
29 23
30/** 24/**
31 * \file 25 * \file
32 * Basic client output functions. 26 * Basic client output functions.
33 * 27 *
… …
41#include <sproto.h> 35#include <sproto.h>
42#include <stdarg.h> 36#include <stdarg.h>
43#include <spells.h> 37#include <spells.h>
44#include <skills.h> 38#include <skills.h>
45 39
40#include <cstring>
41
46/** 42/**
47 * Draws a normal message on the client. It is pretty 43 * Draws a normal message on the client. It is pretty
48 * 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
49 * parameter. the esrv_drawinfo functions should probably be 45 * parameter. the esrv_drawinfo functions should probably be
50 * replaced with this, just using black as the color. 46 * replaced with this, just using black as the color.
51 */ 47 */
52static void 48static void
53esrv_print_msg (NewSocket * ns, int color, const char *str) 49esrv_print_msg (client *ns, int color, const char *str)
54{ 50{
55 char buf[HUGE_BUF]; 51 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} 52}
69 53
70/** 54/**
71 * Draws an extended message on the client. 55 * Draws an extended message on the client.
72 * ns the socket to send message to 56 * ns the socket to send message to
… …
75 * subtype type and subtype of text message 59 * subtype type and subtype of text message
76 * 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
77 * message The main message 61 * message The main message
78 */ 62 */
79static void 63static void
80esrv_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)
81{ 65{
82 char buf[HUGE_BUF];
83
84 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);
85 Write_String_To_Socket (ns, buf, strlen (buf));
86
87/* LOG(llevDebug,"sending %s to socket, len=%d", buf, strlen(buf));*/
88
89} 67}
90 68
91/** 69/**
92 * Frontend for esrv_print_msg 70 * Frontend for esrv_print_msg
93 * \param colr message color 71 * \param colr message color
… …
96 * 74 *
97 * 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.
98 * 76 *
99 * Else sends message to player via esrv_print_msg 77 * Else sends message to player via esrv_print_msg
100 */ 78 */
101
102static void 79static void
103print_message (int colr, const object *pl, const char *tmp) 80print_message (int colr, const object *pl, const char *tmp)
104{ 81{
105 82 if (!tmp)
106 if (tmp == (char *) NULL)
107 {
108 tmp = "[NULL]"; 83 tmp = "[NULL]";
109 }
110 84
111 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 85 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
112 return; 86 return;
113 87
114 if (pl->type == PLAYER) 88 if (pl->type == PLAYER)
115 {
116 esrv_print_msg (&pl->contr->socket, colr, (char *) tmp); 89 esrv_print_msg (pl->contr->ns, colr, (char *)tmp);
117 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)
118 } 108 {
119} 109 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 { 110 {
175 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)
176 break; 113 {
177 else if (pl->contr->outputs[i].first_update < pl->contr->outputs[oldest].first_update) 114 // yes, take over matching buffer, print
178 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;
179 } 124 }
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 125
194 pl->contr->outputs[oldest].first_update = pticks; 126 if (lru->expire > buf->expire)
195 pl->contr->outputs[oldest].count = 1; 127 lru = buf;
196 pl->contr->outputs[oldest].buf = buf;
197 }
198 } 128 }
199}
200 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);
201 135
136 return false;
137}
202 138
203/** 139/**
204 * Sends message to player(s). 140 * Sends message to player(s).
205 * 141 *
206 * flags is various flags - mostly color, plus a few specials. 142 * flags is various flags - mostly color, plus a few specials.
… …
214 * in the flags. 150 * in the flags.
215 * 151 *
216 * 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.
217 * 153 *
218 */ 154 */
219
220void 155void
221new_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)
222{ 157{
223
224 if (flags & NDI_ALL) 158 if (flags & NDI_ALL)
225 { 159 {
226 player *tmppl; 160 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); 161 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 } 162 }
260 else 163 else
261 { 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))
262 print_message (flags & NDI_COLOR_MASK, pl, buf); 173 print_message (flags & NDI_COLOR_MASK, op, buf);
263 } 174 }
264} 175}
265 176
266/** 177/**
267 * Wrapper for new_draw_info printf-like. 178 * Wrapper for new_draw_info printf-like.
… …
269 * 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
270 * 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
271 * 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
272 * client/server bandwidth (client could keep track of various strings 183 * client/server bandwidth (client could keep track of various strings
273 */ 184 */
274
275void 185void
276new_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, ...)
277{ 187{
278 char buf[HUGE_BUF]; 188 char buf[HUGE_BUF];
279 189
280 va_list ap; 190 va_list ap;
281
282 va_start (ap, format); 191 va_start (ap, format);
283
284 vsnprintf (buf, HUGE_BUF, format, ap); 192 vsnprintf (buf, HUGE_BUF, format, ap);
285
286 va_end (ap); 193 va_end (ap);
287 194
288 new_draw_info (flags, pri, pl, buf); 195 new_draw_info (flags, pri, pl, buf);
289} 196}
290
291 197
292void 198void
293draw_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)
294{ 200{
295 201
296 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 202 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
297 return; 203 return;
298 204
299 if (pri >= pl->contr->listening) 205 if (pri >= pl->contr->listening)
300 return; 206 return;
207
301 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 208 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
302 { 209 {
303 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 210 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
304 211
305 if (buf == NULL) 212 if (buf == NULL)
306 LOG (llevError, "info::draw_ext_info -> Out of memory!"); 213 LOG (llevError, "info::draw_ext_info -> Out of memory!");
… …
311 new_draw_info (flags, pri, pl, buf); 218 new_draw_info (flags, pri, pl, buf);
312 free (buf); 219 free (buf);
313 } 220 }
314 } 221 }
315 else 222 else
316 {
317 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);
318 }
319} 224}
320 225
321void 226void
322draw_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, ...)
323{ 228{
324
325 char buf[HUGE_BUF]; 229 char buf[HUGE_BUF];
326 230
327 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 231 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
328 return; 232 return;
329 233
330 if (pri >= pl->contr->listening) 234 if (pri >= pl->contr->listening)
331 return; 235 return;
236
332 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 237 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
333 { 238 {
334 va_list ap; 239 va_list ap;
335 240
336 LOG (llevDebug, "Non supported extension text type for client.\n"); 241 LOG (llevDebug, "Non supported extension text type for client.\n");
337 va_start (ap, new_format); 242 va_start (ap, new_format);
… …
346 251
347 va_start (ap, new_format); 252 va_start (ap, new_format);
348 vsnprintf (buf, HUGE_BUF, new_format, ap); 253 vsnprintf (buf, HUGE_BUF, new_format, ap);
349 va_end (ap); 254 va_end (ap);
350 strip_media_tag (buf); 255 strip_media_tag (buf);
351 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);
352 } 257 }
353} 258}
354 259
355/** 260/**
356 * 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.
357 */ 262 */
358 263
359void 264void
360new_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)
361{ 266{
362 player *pl; 267 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) 268 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
366 {
367 new_draw_info (color, 0, pl->ob, str); 269 new_draw_info (color, 0, pl->ob, str);
368 }
369} 270}
370 271
371/** 272/**
372 * Writes to everyone on the map except op1 and op2 273 * Writes to everyone on the map except op1 and op2
373 */ 274 */
374
375void 275void
376new_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)
377{ 277{
378 player *pl; 278 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) 279 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
382 {
383 new_draw_info (color, 0, pl->ob, str); 280 new_draw_info (color, 0, pl->ob, str);
384 }
385} 281}
386 282
387/** 283/**
388 * Writes to everyone on the specified map 284 * Writes to everyone on the specified map
389 */ 285 */
390
391void 286void
392new_info_map (int color, mapstruct *map, const char *str) 287new_info_map (int color, maptile * map, const char *str)
393{ 288{
394 player *pl; 289 for_all_players (pl)
395
396 for (pl = first_player; pl != NULL; pl = pl->next)
397 if (pl->ob != NULL && pl->ob->map == map) 290 if (pl->ob != NULL && pl->ob->map == map)
398 {
399 new_draw_info (color, 0, pl->ob, str); 291 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} 292}
486 293
487/** 294/**
488 * Sets player title. 295 * Sets player title.
489 */ 296 */
… …
495 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);
496 else 303 else
497 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);
498} 305}
499 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}
500 316
501/** 317/**
502 * Helper for magic map creation. 318 * Helper for magic map creation.
503 * 319 *
504 * 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.
… …
512static void 328static void
513magic_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)
514{ 330{
515 int x, y, dx, dy, mflags; 331 int x, y, dx, dy, mflags;
516 sint16 nx, ny; 332 sint16 nx, ny;
517 mapstruct *mp; 333 maptile *mp;
518 New_Face *f;
519 334
520 for (dx = -1; dx <= 1; dx++) 335 for (dx = -1; dx <= 1; dx++)
521 { 336 {
522 for (dy = -1; dy <= 1; dy++) 337 for (dy = -1; dy <= 1; dy++)
523 { 338 {
… …
535 if (mflags & P_OUT_OF_MAP) 350 if (mflags & P_OUT_OF_MAP)
536 continue; 351 continue;
537 352
538 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)
539 { 354 {
540 f = GET_MAP_FACE (mp, nx, ny, 0); 355 int f = GET_MAP_FACE (mp, nx, ny, 0);
541 if (f == blank_face) 356 if (f == blank_face)
357 {
542 f = GET_MAP_FACE (mp, nx, ny, 1); 358 f = GET_MAP_FACE (mp, nx, ny, 1);
543 if (f == blank_face) 359 if (f == blank_face)
544 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;
545 364
546 /* 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
547 * work. 366 * work.
548 */ 367 */
549 if (mflags & P_BLOCKSVIEW) 368 if (mflags & P_BLOCKSVIEW)
550 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;
551 else 370 else
552 { 371 {
553 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;
554 magic_mapping_mark_recursive (pl, map_mark, x, y); 373 magic_mapping_mark_recursive (pl, map_mark, x, y);
555 } 374 }
556 } 375 }
557 } 376 }
558 } 377 }
559} 378}
560 379
561
562/** 380/**
563 * Creates magic map for player. 381 * Creates magic map for player.
564 * 382 *
565 * Note: For improved magic mapping display, the space that blocks 383 * Note: For improved magic mapping display, the space that blocks
566 * 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
567 * being nonzero have been changed to check for 1. Also, since 385 * 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. 386 * map_mark is a char value, putting 2 in should cause no problems.
569 * 387 *
570 * 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
571 * 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
572 * is for open spaces. map_mark should already have been initialized 390 * is for open spaces. map_mark should already have been initialised
573 * to zero before this is called. 391 * to zero before this is called.
574 * strength is an initial strength*2 rectangular area that we automatically 392 * strength is an initial strength*2 rectangular area that we automatically
575 * see in/penetrate through. 393 * see in/penetrate through.
576 */ 394 */
577
578void 395void
579magic_mapping_mark (object *pl, char *map_mark, int strength) 396magic_mapping_mark (object *pl, char *map_mark, int strength)
580{ 397{
581 int x, y, mflags; 398 int x, y, mflags;
582 sint16 nx, ny; 399 sint16 nx, ny;
583 mapstruct *mp; 400 maptile *mp;
584 New_Face *f;
585 401
586 for (x = -strength; x < strength; x++) 402 for (x = -strength; x < strength; x++)
587 { 403 {
588 for (y = -strength; y < strength; y++) 404 for (y = -strength; y < strength; y++)
589 { 405 {
590 mp = pl->map; 406 mp = pl->map;
591 nx = pl->x + x; 407 nx = pl->x + x;
592 ny = pl->y + y; 408 ny = pl->y + y;
409
593 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 410 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
594 if (mflags & P_OUT_OF_MAP) 411 if (mflags & P_OUT_OF_MAP)
595 continue; 412 continue;
596 else 413
414 int f = GET_MAP_FACE (mp, nx, ny, 0);
415 if (f == blank_face)
597 { 416 {
598 f = GET_MAP_FACE (mp, nx, ny, 0);
599 if (f == blank_face)
600 f = GET_MAP_FACE (mp, nx, ny, 1); 417 f = GET_MAP_FACE (mp, nx, ny, 1);
601 if (f == blank_face) 418 if (f == blank_face)
602 f = GET_MAP_FACE (mp, nx, ny, 2); 419 f = GET_MAP_FACE (mp, nx, ny, 2);
603 } 420 }
604 421
422 int magicmap = faces [f].magicmap;
423
605 if (mflags & P_BLOCKSVIEW) 424 if (mflags & P_BLOCKSVIEW)
606 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;
607 else 426 else
608 { 427 {
609 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;
610 magic_mapping_mark_recursive (pl, map_mark, x, y); 429 magic_mapping_mark_recursive (pl, map_mark, x, y);
611 } 430 }
612 } 431 }
613 } 432 }
614} 433}
615 434
616
617/** 435/**
618 * Creates and sends magic map to player. 436 * Creates and sends magic map to player.
619 * 437 *
620 * 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,
621 * but there is no real easy solution. 439 * but there is no real easy solution.
622 * 440 *
623 * Mark Wedel 441 * Mark Wedel
624 */ 442 */
625
626void 443void
627draw_magic_map (object *pl) 444draw_magic_map (object *pl)
628{ 445{
629 int x, y;
630 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);
631 int xmin, xmax, ymin, ymax; 447 int xmin, xmax, ymin, ymax;
632 SockList sl;
633 448
634 if (pl->type != PLAYER) 449 if (pl->type != PLAYER)
635 { 450 {
636 LOG (llevError, "Non player object called draw_map.\n"); 451 LOG (llevError, "Non player object called draw_map.\n");
637 return; 452 return;
… …
647 */ 462 */
648 xmin = MAGIC_MAP_SIZE; 463 xmin = MAGIC_MAP_SIZE;
649 ymin = MAGIC_MAP_SIZE; 464 ymin = MAGIC_MAP_SIZE;
650 xmax = 0; 465 xmax = 0;
651 ymax = 0; 466 ymax = 0;
467
652 for (x = 0; x < MAGIC_MAP_SIZE; x++) 468 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
653 {
654 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)
655 { 471 {
656 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR)
657 {
658 xmin = x < xmin ? x : xmin; 472 xmin = x < xmin ? x : xmin;
659 xmax = x > xmax ? x : xmax; 473 xmax = x > xmax ? x : xmax;
660 ymin = y < ymin ? y : ymin; 474 ymin = y < ymin ? y : ymin;
661 ymax = y > ymax ? y : ymax; 475 ymax = y > ymax ? y : ymax;
662 }
663 } 476 }
664 }
665 477
666 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 478 packet sl;
667 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),
668 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); 480 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
669 sl.len = strlen ((char *) sl.buf);
670 481
671 for (y = ymin; y <= ymax; y++) 482 for (int y = ymin; y <= ymax; y++)
672 {
673 for (x = xmin; x <= xmax; x++) 483 for (int x = xmin; x <= xmax; x++)
674 {
675 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);
676 } /* x loop */
677 } /* y loop */
678 485
679 Send_With_Handling (&pl->contr->socket, &sl); 486 pl->contr->ns->send_packet (sl);
680 free (sl.buf); 487
681 free (map_mark); 488 free (map_mark);
682} 489}
683 490
684
685/** 491/**
686 * Send a kill log record to sockets 492 * Send a kill log record to sockets
687 */ 493 */
688
689void 494void
690Log_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)
691{ 496{
692 int i;
693 size_t len; 497 size_t len;
694 char buf[MAX_BUF]; 498 char buf[MAX_BUF];
695 499
696 if (With != NULL) 500 if (With != NULL)
697 {
698 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType); 501 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType);
699 }
700 else 502 else
701 {
702 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);
703 } 504
704 len = strlen (buf); 505 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} 506}
507

Diff Legend

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