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.2 by root, Tue Aug 29 08:01:38 2006 UTC vs.
Revision 1.41 by root, Thu May 3 10:39:46 2007 UTC

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

Diff Legend

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