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.53 by root, Thu Oct 15 21:09:32 2009 UTC

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

Diff Legend

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