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.46 by root, Sun Jul 1 05:00:20 2007 UTC

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

Diff Legend

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