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

Diff Legend

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