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.17 by root, Thu Dec 14 04:30:33 2006 UTC vs.
Revision 1.46 by root, Sun Jul 1 05:00:20 2007 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
4 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT 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
22 The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <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 (client_socket * ns, int color, const char *str) 49esrv_print_msg (client *ns, int color, const char *str)
49{ 50{
50 packet sl; 51 ns->send_msg (color, "info", str);
51
52 if (ns->status == Ns_Old)
53 sl.printf ("%s\n", str);
54 else
55 sl.printf ("drawinfo %d %s", color, str);
56
57 ns->send_packet (sl);
58} 52}
59 53
60/** 54/**
61 * Draws an extended message on the client. 55 * Draws an extended message on the client.
62 * ns the socket to send message to 56 * ns the socket to send message to
… …
65 * subtype type and subtype of text message 59 * subtype type and subtype of text message
66 * 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
67 * message The main message 61 * message The main message
68 */ 62 */
69static void 63static void
70esrv_print_ext_msg (client_socket * 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)
71{ 65{
72 packet sl;
73
74 sl.printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message); 66 ns->send_packet_printf ("drawextinfo %d %u %u %s", color, type, subtype, message);
75 ns->send_packet (sl);
76} 67}
77 68
78/** 69/**
79 * Frontend for esrv_print_msg 70 * Frontend for esrv_print_msg
80 * \param colr message color 71 * \param colr message color
… …
83 * 74 *
84 * 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.
85 * 76 *
86 * Else sends message to player via esrv_print_msg 77 * Else sends message to player via esrv_print_msg
87 */ 78 */
88
89static void 79static void
90print_message (int colr, const object *pl, const char *tmp) 80print_message (int colr, const object *pl, const char *tmp)
91{ 81{
92
93 if (!tmp) 82 if (!tmp)
94 tmp = "[NULL]"; 83 tmp = "[NULL]";
95 84
96 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 85 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
97 return; 86 return;
98 87
99 if (pl->type == PLAYER) 88 if (pl->type == PLAYER)
100 esrv_print_msg (pl->contr->socket, colr, (char *) tmp); 89 esrv_print_msg (pl->contr->ns, colr, (char *)tmp);
101} 90}
102 91
103/** 92bool
104 * Prints out the contents of specified buffer structures, 93client::msg_suppressed (const char *msg)
105 * and clears the string.
106 */
107
108void
109flush_output_element (const object *pl, Output_Buf * outputs)
110{ 94{
111 char tbuf[MAX_BUF]; 95 if (!pl)
112
113 if (outputs->buf == NULL)
114 return; 96 return false;
115 if (outputs->count > 1) 97
116 { 98 if (pl->outputs_count <= 1 || !pl->outputs_sync)
117 snprintf (tbuf, MAX_BUF, "%d times %s", outputs->count, &outputs->buf); 99 return false;
118 print_message (NDI_BLACK, pl, tbuf); 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)
119 } 108 {
120 else 109 if (len == buf->len && !memcmp (msg, buf->msg, len))
121 print_message (NDI_BLACK, pl, &outputs->buf);
122
123 outputs->buf = NULL;
124 outputs->first_update = 0; /* This way, it will be reused */
125}
126
127/**
128 * Sends message to player through output buffers.
129 * \param pl player to send message
130 * \param buf message to send
131 *
132 * If player's output_count is 1, sends message directly.
133 *
134 * Else checks output buffers for specified message.
135 *
136 * If found, checks if message should be sent now.
137 *
138 * If message not already in buffers, flushes olders buffer,
139 * and adds message to queue.
140 */
141
142static void
143check_output_buffers (const object *pl, const char *buf)
144{
145 int i, oldest = 0;
146
147 if (pl->contr->outputs_count < 2)
148 {
149 print_message (NDI_BLACK, pl, buf);
150 return;
151 }
152 else
153 {
154 for (i = 0; i < NUM_OUTPUT_BUFS; i++)
155 { 110 {
156 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)
157 break; 113 {
158 else if (pl->contr->outputs[i].first_update < pl->contr->outputs[oldest].first_update) 114 // yes, take over matching buffer, print
159 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;
160 } 124 }
161 /* We found a match */
162 if (i < NUM_OUTPUT_BUFS)
163 {
164 pl->contr->outputs[i].count++;
165 if (pl->contr->outputs[i].count >= pl->contr->outputs_count)
166 {
167 flush_output_element (pl, &pl->contr->outputs[i]);
168 }
169 }
170 /* No match - flush the oldest, and put the new one in */
171 else
172 {
173 flush_output_element (pl, &pl->contr->outputs[oldest]);
174 125
175 pl->contr->outputs[oldest].first_update = pticks; 126 if (lru->expire > buf->expire)
176 pl->contr->outputs[oldest].count = 1; 127 lru = buf;
177 pl->contr->outputs[oldest].buf = buf;
178 }
179 } 128 }
180}
181 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);
182 135
136 return false;
137}
183 138
184/** 139/**
185 * Sends message to player(s). 140 * Sends message to player(s).
186 * 141 *
187 * flags is various flags - mostly color, plus a few specials. 142 * flags is various flags - mostly color, plus a few specials.
… …
195 * in the flags. 150 * in the flags.
196 * 151 *
197 * 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.
198 * 153 *
199 */ 154 */
200
201void 155void
202new_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)
203{ 157{
204
205 if (flags & NDI_ALL) 158 if (flags & NDI_ALL)
206 { 159 {
207 player *tmppl; 160 for_all_players (pl)
208
209 for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
210 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); 161 new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
211
212 return;
213 }
214
215 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
216 { 162 }
217 /* Write to the socket? */
218 print_message (0, NULL, buf);
219 return;
220 }
221
222 if (pl->type != PLAYER)
223 return;
224
225 if (pri >= pl->contr->listening)
226 return;
227
228 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE))
229 /* following prints stuff out, as appropriate */
230 check_output_buffers (pl, buf);
231 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))
232 print_message (flags & NDI_COLOR_MASK, pl, buf); 173 print_message (flags & NDI_COLOR_MASK, op, buf);
174 }
233} 175}
234 176
235/** 177/**
236 * Wrapper for new_draw_info printf-like. 178 * Wrapper for new_draw_info printf-like.
237 * 179 *
238 * 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
239 * 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
240 * 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
241 * client/server bandwidth (client could keep track of various strings 183 * client/server bandwidth (client could keep track of various strings
242 */ 184 */
243
244void 185void
245new_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, ...)
246{ 187{
247 char buf[HUGE_BUF]; 188 char buf[HUGE_BUF];
248 189
249 va_list ap; 190 va_list ap;
250
251 va_start (ap, format); 191 va_start (ap, format);
252
253 vsnprintf (buf, HUGE_BUF, format, ap); 192 vsnprintf (buf, HUGE_BUF, format, ap);
254
255 va_end (ap); 193 va_end (ap);
256 194
257 new_draw_info (flags, pri, pl, buf); 195 new_draw_info (flags, pri, pl, buf);
258} 196}
259
260 197
261void 198void
262draw_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)
263{ 200{
264 201
… …
266 return; 203 return;
267 204
268 if (pri >= pl->contr->listening) 205 if (pri >= pl->contr->listening)
269 return; 206 return;
270 207
271 if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type)) 208 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
272 { 209 {
273 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 210 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
274 211
275 if (buf == NULL) 212 if (buf == NULL)
276 LOG (llevError, "info::draw_ext_info -> Out of memory!"); 213 LOG (llevError, "info::draw_ext_info -> Out of memory!");
… …
281 new_draw_info (flags, pri, pl, buf); 218 new_draw_info (flags, pri, pl, buf);
282 free (buf); 219 free (buf);
283 } 220 }
284 } 221 }
285 else 222 else
286 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);
287} 224}
288 225
289void 226void
290draw_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, ...)
291{ 228{
292
293 char buf[HUGE_BUF]; 229 char buf[HUGE_BUF];
294 230
295 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 231 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
296 return; 232 return;
297 233
298 if (pri >= pl->contr->listening) 234 if (pri >= pl->contr->listening)
299 return; 235 return;
300 236
301 if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type)) 237 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
302 { 238 {
303 va_list ap; 239 va_list ap;
304 240
305 LOG (llevDebug, "Non supported extension text type for client.\n"); 241 LOG (llevDebug, "Non supported extension text type for client.\n");
306 va_start (ap, new_format); 242 va_start (ap, new_format);
… …
315 251
316 va_start (ap, new_format); 252 va_start (ap, new_format);
317 vsnprintf (buf, HUGE_BUF, new_format, ap); 253 vsnprintf (buf, HUGE_BUF, new_format, ap);
318 va_end (ap); 254 va_end (ap);
319 strip_media_tag (buf); 255 strip_media_tag (buf);
320 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);
321 } 257 }
322} 258}
323 259
324/** 260/**
325 * 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.
326 */ 262 */
327 263
328void 264void
329new_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)
330{ 266{
331 player *pl; 267 for_all_players (pl)
332
333 for (pl = first_player; pl != NULL; pl = pl->next)
334 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 268 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
335 {
336 new_draw_info (color, 0, pl->ob, str); 269 new_draw_info (color, 0, pl->ob, str);
337 }
338} 270}
339 271
340/** 272/**
341 * Writes to everyone on the map except op1 and op2 273 * Writes to everyone on the map except op1 and op2
342 */ 274 */
343
344void 275void
345new_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)
346{ 277{
347 player *pl; 278 for_all_players (pl)
348
349 for (pl = first_player; pl != NULL; pl = pl->next)
350 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)
351 {
352 new_draw_info (color, 0, pl->ob, str); 280 new_draw_info (color, 0, pl->ob, str);
353 }
354} 281}
355 282
356/** 283/**
357 * Writes to everyone on the specified map 284 * Writes to everyone on the specified map
358 */ 285 */
359
360void 286void
361new_info_map (int color, maptile * map, const char *str) 287new_info_map (int color, maptile * map, const char *str)
362{ 288{
363 player *pl; 289 for_all_players (pl)
364
365 for (pl = first_player; pl != NULL; pl = pl->next)
366 if (pl->ob != NULL && pl->ob->map == map) 290 if (pl->ob != NULL && pl->ob->map == map)
367 {
368 new_draw_info (color, 0, pl->ob, str); 291 new_draw_info (color, 0, pl->ob, str);
369 }
370}
371
372
373/**
374 * This does nothing now. However, in theory, we should probably send
375 * something to the client and let the client figure out how it might want
376 * to handle this
377 */
378void
379clear_win_info (object *op)
380{
381}
382
383/**
384 * Get player's current range attack in obuf.
385 */
386void
387rangetostring (object *pl, char *obuf)
388{
389 switch (pl->contr->shoottype)
390 {
391 case range_none:
392 strcpy (obuf, "Range: nothing");
393 break;
394
395 case range_bow:
396 {
397 object *op;
398
399 for (op = pl->inv; op; op = op->below)
400 if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED))
401 break;
402
403 if (op == NULL)
404 break;
405
406 sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing");
407 }
408 break;
409
410 case range_magic:
411 if (settings.casting_time == TRUE)
412 {
413 if (pl->casting_time > -1)
414 {
415 if (pl->casting_time == 0)
416 sprintf (obuf, "Range: Holding spell (%s)", &pl->spell->name);
417 else
418 sprintf (obuf, "Range: Casting spell (%s)", &pl->spell->name);
419 }
420 else
421 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
422 }
423 else
424 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
425 break;
426
427 case range_misc:
428 sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none");
429 break;
430
431 /* range_scroll is only used for controlling golems. If the
432 * the player does not have a golem, reset some things.
433 */
434 case range_golem:
435 if (pl->contr->ranges[range_golem] != NULL)
436 sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name);
437 else
438 {
439 pl->contr->shoottype = range_none;
440 strcpy (obuf, "Range: nothing");
441 }
442 break;
443
444 case range_skill:
445 sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none");
446 break;
447
448 case range_builder:
449 sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0));
450 break;
451
452 default:
453 strcpy (obuf, "Range: illegal");
454 }
455} 292}
456 293
457/** 294/**
458 * Sets player title. 295 * Sets player title.
459 */ 296 */
… …
465 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);
466 else 303 else
467 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);
468} 305}
469 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}
470 316
471/** 317/**
472 * Helper for magic map creation. 318 * Helper for magic map creation.
473 * 319 *
474 * 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.
… …
483magic_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)
484{ 330{
485 int x, y, dx, dy, mflags; 331 int x, y, dx, dy, mflags;
486 sint16 nx, ny; 332 sint16 nx, ny;
487 maptile *mp; 333 maptile *mp;
488 New_Face *f;
489 334
490 for (dx = -1; dx <= 1; dx++) 335 for (dx = -1; dx <= 1; dx++)
491 { 336 {
492 for (dy = -1; dy <= 1; dy++) 337 for (dy = -1; dy <= 1; dy++)
493 { 338 {
… …
505 if (mflags & P_OUT_OF_MAP) 350 if (mflags & P_OUT_OF_MAP)
506 continue; 351 continue;
507 352
508 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)
509 { 354 {
510 f = GET_MAP_FACE (mp, nx, ny, 0); 355 int f = GET_MAP_FACE (mp, nx, ny, 0);
511 if (f == blank_face) 356 if (f == blank_face)
357 {
512 f = GET_MAP_FACE (mp, nx, ny, 1); 358 f = GET_MAP_FACE (mp, nx, ny, 1);
513 if (f == blank_face) 359 if (f == blank_face)
514 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;
515 364
516 /* 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
517 * work. 366 * work.
518 */ 367 */
519 if (mflags & P_BLOCKSVIEW) 368 if (mflags & P_BLOCKSVIEW)
520 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;
521 else 370 else
522 { 371 {
523 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;
524 magic_mapping_mark_recursive (pl, map_mark, x, y); 373 magic_mapping_mark_recursive (pl, map_mark, x, y);
525 } 374 }
526 } 375 }
527 } 376 }
528 } 377 }
529} 378}
530 379
531
532/** 380/**
533 * Creates magic map for player. 381 * Creates magic map for player.
534 * 382 *
535 * Note: For improved magic mapping display, the space that blocks 383 * Note: For improved magic mapping display, the space that blocks
536 * 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
537 * being nonzero have been changed to check for 1. Also, since 385 * being nonzero have been changed to check for 1. Also, since
538 * 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.
539 * 387 *
540 * 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
541 * 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
542 * is for open spaces. map_mark should already have been initialized 390 * is for open spaces. map_mark should already have been initialised
543 * to zero before this is called. 391 * to zero before this is called.
544 * strength is an initial strength*2 rectangular area that we automatically 392 * strength is an initial strength*2 rectangular area that we automatically
545 * see in/penetrate through. 393 * see in/penetrate through.
546 */ 394 */
547
548void 395void
549magic_mapping_mark (object *pl, char *map_mark, int strength) 396magic_mapping_mark (object *pl, char *map_mark, int strength)
550{ 397{
551 int x, y, mflags; 398 int x, y, mflags;
552 sint16 nx, ny; 399 sint16 nx, ny;
553 maptile *mp; 400 maptile *mp;
554 New_Face *f;
555 401
556 for (x = -strength; x < strength; x++) 402 for (x = -strength; x < strength; x++)
557 { 403 {
558 for (y = -strength; y < strength; y++) 404 for (y = -strength; y < strength; y++)
559 { 405 {
560 mp = pl->map; 406 mp = pl->map;
561 nx = pl->x + x; 407 nx = pl->x + x;
562 ny = pl->y + y; 408 ny = pl->y + y;
409
563 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 410 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
564 if (mflags & P_OUT_OF_MAP) 411 if (mflags & P_OUT_OF_MAP)
565 continue; 412 continue;
566 else 413
414 int f = GET_MAP_FACE (mp, nx, ny, 0);
415 if (f == blank_face)
567 { 416 {
568 f = GET_MAP_FACE (mp, nx, ny, 0);
569 if (f == blank_face)
570 f = GET_MAP_FACE (mp, nx, ny, 1); 417 f = GET_MAP_FACE (mp, nx, ny, 1);
571 if (f == blank_face) 418 if (f == blank_face)
572 f = GET_MAP_FACE (mp, nx, ny, 2); 419 f = GET_MAP_FACE (mp, nx, ny, 2);
573 } 420 }
574 421
422 int magicmap = faces [f].magicmap;
423
575 if (mflags & P_BLOCKSVIEW) 424 if (mflags & P_BLOCKSVIEW)
576 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;
577 else 426 else
578 { 427 {
579 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;
580 magic_mapping_mark_recursive (pl, map_mark, x, y); 429 magic_mapping_mark_recursive (pl, map_mark, x, y);
581 } 430 }
582 } 431 }
583 } 432 }
584} 433}
585 434
586
587/** 435/**
588 * Creates and sends magic map to player. 436 * Creates and sends magic map to player.
589 * 437 *
590 * 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,
591 * but there is no real easy solution. 439 * but there is no real easy solution.
592 * 440 *
593 * Mark Wedel 441 * Mark Wedel
594 */ 442 */
595
596void 443void
597draw_magic_map (object *pl) 444draw_magic_map (object *pl)
598{ 445{
599 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);
600 int xmin, xmax, ymin, ymax; 447 int xmin, xmax, ymin, ymax;
… …
618 xmax = 0; 465 xmax = 0;
619 ymax = 0; 466 ymax = 0;
620 467
621 for (int x = 0; x < MAGIC_MAP_SIZE; x++) 468 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
622 for (int y = 0; y < MAGIC_MAP_SIZE; y++) 469 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
623 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 470 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
624 { 471 {
625 xmin = x < xmin ? x : xmin; 472 xmin = x < xmin ? x : xmin;
626 xmax = x > xmax ? x : xmax; 473 xmax = x > xmax ? x : xmax;
627 ymin = y < ymin ? y : ymin; 474 ymin = y < ymin ? y : ymin;
628 ymax = y > ymax ? y : ymax; 475 ymax = y > ymax ? y : ymax;
… …
634 481
635 for (int y = ymin; y <= ymax; y++) 482 for (int y = ymin; y <= ymax; y++)
636 for (int x = xmin; x <= xmax; x++) 483 for (int x = xmin; x <= xmax; x++)
637 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR); 484 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
638 485
639 Send_With_Handling (pl->contr->socket, &sl); 486 pl->contr->ns->send_packet (sl);
640 487
641 free (map_mark); 488 free (map_mark);
642} 489}
643 490
644
645/** 491/**
646 * Send a kill log record to sockets 492 * Send a kill log record to sockets
647 */ 493 */
648
649void 494void
650Log_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)
651{ 496{
652 size_t len; 497 size_t len;
653 char buf[MAX_BUF]; 498 char buf[MAX_BUF];
… …
657 else 502 else
658 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);
659 504
660 len = strlen (buf); 505 len = strlen (buf);
661} 506}
507

Diff Legend

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