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.12 by pippijn, Sat Dec 9 17:28:37 2006 UTC vs.
Revision 1.41 by root, Thu May 3 10:39:46 2007 UTC

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

Diff Legend

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