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.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 (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 *pl, const char *buf)
214{ 156{
215
216 if (flags & NDI_ALL) 157 if (flags & NDI_ALL)
217 { 158 {
218 player *tmppl; 159 for_all_players (pl)
219
220 for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
221 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); 160 new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
222 161
223 return; 162 return;
224 } 163 }
225 164
226 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 165 if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns)
227 {
228 /* Write to the socket? */
229 print_message (0, NULL, buf);
230 return;
231 }
232
233 if (pl->type != PLAYER)
234 return; 166 return;
235 167
236 if (pri >= pl->contr->listening) 168 if (pri >= pl->contr->listening)
237 return; 169 return;
238 170
239 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) 171 if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK
240 /* following prints stuff out, as appropriate */ 172 || !pl->contr->ns->msg_suppressed (buf))
241 check_output_buffers (pl, buf);
242 else
243 print_message (flags & NDI_COLOR_MASK, pl, buf); 173 print_message (flags & NDI_COLOR_MASK, pl, buf);
244} 174}
245 175
246/** 176/**
247 * Wrapper for new_draw_info printf-like. 177 * Wrapper for new_draw_info printf-like.
… …
249 * 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
250 * 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
251 * 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
252 * client/server bandwidth (client could keep track of various strings 182 * client/server bandwidth (client could keep track of various strings
253 */ 183 */
254
255void 184void
256new_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, ...)
257{ 186{
258 char buf[HUGE_BUF]; 187 char buf[HUGE_BUF];
259 188
260 va_list ap; 189 va_list ap;
261
262 va_start (ap, format); 190 va_start (ap, format);
263
264 vsnprintf (buf, HUGE_BUF, format, ap); 191 vsnprintf (buf, HUGE_BUF, format, ap);
265
266 va_end (ap); 192 va_end (ap);
267 193
268 new_draw_info (flags, pri, pl, buf); 194 new_draw_info (flags, pri, pl, buf);
269} 195}
270 196
271
272void 197void
273draw_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)
274{ 199{
275 200
276 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 201 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
277 return; 202 return;
278 203
279 if (pri >= pl->contr->listening) 204 if (pri >= pl->contr->listening)
280 return; 205 return;
206
281 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 207 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
282 { 208 {
283 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 209 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
284 210
285 if (buf == NULL) 211 if (buf == NULL)
286 LOG (llevError, "info::draw_ext_info -> Out of memory!"); 212 LOG (llevError, "info::draw_ext_info -> Out of memory!");
… …
291 new_draw_info (flags, pri, pl, buf); 217 new_draw_info (flags, pri, pl, buf);
292 free (buf); 218 free (buf);
293 } 219 }
294 } 220 }
295 else 221 else
296 {
297 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);
298 }
299} 223}
300 224
301void 225void
302draw_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, ...)
303{ 227{
304
305 char buf[HUGE_BUF]; 228 char buf[HUGE_BUF];
306 229
307 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 230 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
308 return; 231 return;
309 232
310 if (pri >= pl->contr->listening) 233 if (pri >= pl->contr->listening)
311 return; 234 return;
235
312 if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) 236 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
313 { 237 {
314 va_list ap; 238 va_list ap;
315 239
316 LOG (llevDebug, "Non supported extension text type for client.\n"); 240 LOG (llevDebug, "Non supported extension text type for client.\n");
317 va_start (ap, new_format); 241 va_start (ap, new_format);
… …
326 250
327 va_start (ap, new_format); 251 va_start (ap, new_format);
328 vsnprintf (buf, HUGE_BUF, new_format, ap); 252 vsnprintf (buf, HUGE_BUF, new_format, ap);
329 va_end (ap); 253 va_end (ap);
330 strip_media_tag (buf); 254 strip_media_tag (buf);
331 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);
332 } 256 }
333} 257}
334 258
335/** 259/**
336 * 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.
337 */ 261 */
338 262
339void 263void
340new_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)
341{ 265{
342 player *pl; 266 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) 267 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
346 {
347 new_draw_info (color, 0, pl->ob, str); 268 new_draw_info (color, 0, pl->ob, str);
348 }
349} 269}
350 270
351/** 271/**
352 * Writes to everyone on the map except op1 and op2 272 * Writes to everyone on the map except op1 and op2
353 */ 273 */
354 274
355void 275void
356new_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)
357{ 277{
358 player *pl; 278 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) 279 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
362 {
363 new_draw_info (color, 0, pl->ob, str); 280 new_draw_info (color, 0, pl->ob, str);
364 }
365} 281}
366 282
367/** 283/**
368 * Writes to everyone on the specified map 284 * Writes to everyone on the specified map
369 */ 285 */
370 286
371void 287void
372new_info_map (int color, maptile * map, const char *str) 288new_info_map (int color, maptile * map, const char *str)
373{ 289{
374 player *pl; 290 for_all_players (pl)
375
376 for (pl = first_player; pl != NULL; pl = pl->next)
377 if (pl->ob != NULL && pl->ob->map == map) 291 if (pl->ob != NULL && pl->ob->map == map)
378 {
379 new_draw_info (color, 0, pl->ob, str); 292 new_draw_info (color, 0, pl->ob, str);
380 }
381} 293}
382
383 294
384/** 295/**
385 * This does nothing now. However, in theory, we should probably send 296 * 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 297 * something to the client and let the client figure out how it might want
387 * to handle this 298 * to handle this
… …
397void 308void
398rangetostring (object *pl, char *obuf) 309rangetostring (object *pl, char *obuf)
399{ 310{
400 switch (pl->contr->shoottype) 311 switch (pl->contr->shoottype)
401 { 312 {
402 case range_none:
403 strcpy (obuf, "Range: nothing");
404 break;
405
406 case range_bow: 313 case range_bow:
407 {
408 object *op;
409
410 for (op = pl->inv; op; op = op->below) 314 for (object *op = pl->inv; op; op = op->below)
411 if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED)) 315 if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED))
412 break;
413
414 if (op == NULL)
415 break; 316 {
416
417 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;
418 } 319 }
320
419 break; 321 break;
420 322
421 case range_magic: 323 case range_magic:
422 if (settings.casting_time == TRUE) 324 if (settings.casting_time == TRUE)
423 { 325 {
424 if (pl->casting_time > -1) 326 if (pl->casting_time > -1)
425 { 327 {
426 if (pl->casting_time == 0) 328 if (pl->casting_time == 0)
427 sprintf (obuf, "Range: Holding spell (%s)", &pl->spell->name); 329 sprintf (obuf, "Holding spell: %s", &pl->spell->name);
428 else 330 else
429 sprintf (obuf, "Range: Casting spell (%s)", &pl->spell->name); 331 sprintf (obuf, "Casting spell: %s", &pl->spell->name);
430 } 332 }
431 else 333 else
432 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name); 334 sprintf (obuf, "Spell: %s", &pl->contr->ranges[range_magic]->name);
433 } 335 }
434 else 336 else
435 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name); 337 sprintf (obuf, "Spell: %s", &pl->contr->ranges[range_magic]->name);
338
436 break; 339 return;
437 340
438 case range_misc: 341 case range_misc:
439 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
440 break; 348 break;
441 349
442 /* range_scroll is only used for controlling golems. If the 350 /* range_scroll is only used for controlling golems. If the
443 * the player does not have a golem, reset some things. 351 * the player does not have a golem, reset some things.
444 */ 352 */
445 case range_golem: 353 case range_golem:
446 if (pl->contr->ranges[range_golem] != NULL) 354 if (object *golem = pl->contr->ranges[range_golem])
447 sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name);
448 else
449 { 355 {
450 pl->contr->shoottype = range_none; 356 sprintf (obuf, "Golem: %s", &golem->name);
451 strcpy (obuf, "Range: nothing"); 357 return;
452 } 358 }
359
453 break; 360 break;
454 361
455 case range_skill: 362 case range_skill:
456 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
457 break; 369 break;
458 370
459 case range_builder: 371 case range_builder:
460 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));
461 break; 373 return;
374 }
462 375
463 default: 376 pl->contr->shoottype = range_none;
464 strcpy (obuf, "Range: illegal"); 377 strcpy (obuf, "Range: nothing");
465 }
466} 378}
467 379
468/** 380/**
469 * Sets player title. 381 * Sets player title.
470 */ 382 */
… …
476 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);
477 else 389 else
478 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);
479} 391}
480 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}
481 402
482/** 403/**
483 * Helper for magic map creation. 404 * Helper for magic map creation.
484 * 405 *
485 * 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.
… …
494magic_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)
495{ 416{
496 int x, y, dx, dy, mflags; 417 int x, y, dx, dy, mflags;
497 sint16 nx, ny; 418 sint16 nx, ny;
498 maptile *mp; 419 maptile *mp;
499 New_Face *f;
500 420
501 for (dx = -1; dx <= 1; dx++) 421 for (dx = -1; dx <= 1; dx++)
502 { 422 {
503 for (dy = -1; dy <= 1; dy++) 423 for (dy = -1; dy <= 1; dy++)
504 { 424 {
… …
516 if (mflags & P_OUT_OF_MAP) 436 if (mflags & P_OUT_OF_MAP)
517 continue; 437 continue;
518 438
519 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)
520 { 440 {
521 f = GET_MAP_FACE (mp, nx, ny, 0); 441 int f = GET_MAP_FACE (mp, nx, ny, 0);
522 if (f == blank_face) 442 if (f == blank_face)
443 {
523 f = GET_MAP_FACE (mp, nx, ny, 1); 444 f = GET_MAP_FACE (mp, nx, ny, 1);
524 if (f == blank_face) 445 if (f == blank_face)
525 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;
526 450
527 /* 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
528 * work. 452 * work.
529 */ 453 */
530 if (mflags & P_BLOCKSVIEW) 454 if (mflags & P_BLOCKSVIEW)
531 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;
532 else 456 else
533 { 457 {
534 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;
535 magic_mapping_mark_recursive (pl, map_mark, x, y); 459 magic_mapping_mark_recursive (pl, map_mark, x, y);
536 } 460 }
537 } 461 }
538 } 462 }
539 } 463 }
540} 464}
541 465
542
543/** 466/**
544 * Creates magic map for player. 467 * Creates magic map for player.
545 * 468 *
546 * Note: For improved magic mapping display, the space that blocks 469 * Note: For improved magic mapping display, the space that blocks
547 * 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
548 * being nonzero have been changed to check for 1. Also, since 471 * 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. 472 * map_mark is a char value, putting 2 in should cause no problems.
550 * 473 *
551 * 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
552 * 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
553 * is for open spaces. map_mark should already have been initialized 476 * is for open spaces. map_mark should already have been initialised
554 * to zero before this is called. 477 * to zero before this is called.
555 * strength is an initial strength*2 rectangular area that we automatically 478 * strength is an initial strength*2 rectangular area that we automatically
556 * see in/penetrate through. 479 * see in/penetrate through.
557 */ 480 */
558
559void 481void
560magic_mapping_mark (object *pl, char *map_mark, int strength) 482magic_mapping_mark (object *pl, char *map_mark, int strength)
561{ 483{
562 int x, y, mflags; 484 int x, y, mflags;
563 sint16 nx, ny; 485 sint16 nx, ny;
564 maptile *mp; 486 maptile *mp;
565 New_Face *f;
566 487
567 for (x = -strength; x < strength; x++) 488 for (x = -strength; x < strength; x++)
568 { 489 {
569 for (y = -strength; y < strength; y++) 490 for (y = -strength; y < strength; y++)
570 { 491 {
571 mp = pl->map; 492 mp = pl->map;
572 nx = pl->x + x; 493 nx = pl->x + x;
573 ny = pl->y + y; 494 ny = pl->y + y;
495
574 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 496 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
575 if (mflags & P_OUT_OF_MAP) 497 if (mflags & P_OUT_OF_MAP)
576 continue; 498 continue;
577 else 499
500 int f = GET_MAP_FACE (mp, nx, ny, 0);
501 if (f == blank_face)
578 { 502 {
579 f = GET_MAP_FACE (mp, nx, ny, 0);
580 if (f == blank_face)
581 f = GET_MAP_FACE (mp, nx, ny, 1); 503 f = GET_MAP_FACE (mp, nx, ny, 1);
582 if (f == blank_face) 504 if (f == blank_face)
583 f = GET_MAP_FACE (mp, nx, ny, 2); 505 f = GET_MAP_FACE (mp, nx, ny, 2);
584 } 506 }
585 507
508 int magicmap = faces [f].magicmap;
509
586 if (mflags & P_BLOCKSVIEW) 510 if (mflags & P_BLOCKSVIEW)
587 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;
588 else 512 else
589 { 513 {
590 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;
591 magic_mapping_mark_recursive (pl, map_mark, x, y); 515 magic_mapping_mark_recursive (pl, map_mark, x, y);
592 } 516 }
593 } 517 }
594 } 518 }
595} 519}
596 520
597
598/** 521/**
599 * Creates and sends magic map to player. 522 * Creates and sends magic map to player.
600 * 523 *
601 * 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,
602 * but there is no real easy solution. 525 * but there is no real easy solution.
603 * 526 *
604 * Mark Wedel 527 * Mark Wedel
605 */ 528 */
606
607void 529void
608draw_magic_map (object *pl) 530draw_magic_map (object *pl)
609{ 531{
610 int x, y;
611 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);
612 int xmin, xmax, ymin, ymax; 533 int xmin, xmax, ymin, ymax;
613 SockList sl;
614 534
615 if (pl->type != PLAYER) 535 if (pl->type != PLAYER)
616 { 536 {
617 LOG (llevError, "Non player object called draw_map.\n"); 537 LOG (llevError, "Non player object called draw_map.\n");
618 return; 538 return;
… …
628 */ 548 */
629 xmin = MAGIC_MAP_SIZE; 549 xmin = MAGIC_MAP_SIZE;
630 ymin = MAGIC_MAP_SIZE; 550 ymin = MAGIC_MAP_SIZE;
631 xmax = 0; 551 xmax = 0;
632 ymax = 0; 552 ymax = 0;
553
633 for (x = 0; x < MAGIC_MAP_SIZE; x++) 554 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
634 {
635 for (y = 0; y < MAGIC_MAP_SIZE; y++) 555 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
556 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
636 { 557 {
637 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR)
638 {
639 xmin = x < xmin ? x : xmin; 558 xmin = x < xmin ? x : xmin;
640 xmax = x > xmax ? x : xmax; 559 xmax = x > xmax ? x : xmax;
641 ymin = y < ymin ? y : ymin; 560 ymin = y < ymin ? y : ymin;
642 ymax = y > ymax ? y : ymax; 561 ymax = y > ymax ? y : ymax;
643 }
644 } 562 }
645 }
646 563
647 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 564 packet sl;
648 snprintf ((char *) sl.buf, MAXSOCKBUF, "magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1), 565 sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),
649 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); 566 MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
650 sl.len = strlen ((char *) sl.buf);
651 567
652 for (y = ymin; y <= ymax; y++) 568 for (int y = ymin; y <= ymax; y++)
653 {
654 for (x = xmin; x <= xmax; x++) 569 for (int x = xmin; x <= xmax; x++)
655 {
656 sl.buf[sl.len++] = map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR; 570 sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
657 } /* x loop */
658 } /* y loop */
659 571
660 Send_With_Handling (&pl->contr->socket, &sl); 572 pl->contr->ns->send_packet (sl);
661 free (sl.buf); 573
662 free (map_mark); 574 free (map_mark);
663} 575}
664 576
665
666/** 577/**
667 * Send a kill log record to sockets 578 * Send a kill log record to sockets
668 */ 579 */
669
670void 580void
671Log_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)
672{ 582{
673 size_t len; 583 size_t len;
674 char buf[MAX_BUF]; 584 char buf[MAX_BUF];
… …
678 else 588 else
679 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);
680 590
681 len = strlen (buf); 591 len = strlen (buf);
682} 592}
593

Diff Legend

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