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

Diff Legend

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