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

Diff Legend

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