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.24 by root, Mon Dec 25 11:25:50 2006 UTC vs.
Revision 1.31 by root, Tue Jan 9 21:32:43 2007 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
4 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
7 7
8 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
… …
185void 185void
186new_draw_info (int flags, int pri, const object *pl, const char *buf) 186new_draw_info (int flags, int pri, const object *pl, const char *buf)
187{ 187{
188 if (flags & NDI_ALL) 188 if (flags & NDI_ALL)
189 { 189 {
190 player *tmppl;
191
192 for_all_players (pl) 190 for_all_players (pl)
193 new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); 191 new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
194 192
195 return; 193 return;
196 } 194 }
197 195
198 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 196 if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns)
199 {
200 /* Write to the socket? */
201 print_message (0, NULL, buf);
202 return;
203 }
204
205 if (pl->type != PLAYER)
206 return; 197 return;
207 198
208 if (pri >= pl->contr->listening) 199 if (pri >= pl->contr->listening)
209 return; 200 return;
210 201
211 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) 202 if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE))
212 /* following prints stuff out, as appropriate */
213 check_output_buffers (pl, buf); 203 check_output_buffers (pl, buf);
214 else 204 else
215 print_message (flags & NDI_COLOR_MASK, pl, buf); 205 print_message (flags & NDI_COLOR_MASK, pl, buf);
216} 206}
217 207
… …
227new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...) 217new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...)
228{ 218{
229 char buf[HUGE_BUF]; 219 char buf[HUGE_BUF];
230 220
231 va_list ap; 221 va_list ap;
232
233 va_start (ap, format); 222 va_start (ap, format);
234
235 vsnprintf (buf, HUGE_BUF, format, ap); 223 vsnprintf (buf, HUGE_BUF, format, ap);
236
237 va_end (ap); 224 va_end (ap);
238 225
239 new_draw_info (flags, pri, pl, buf); 226 new_draw_info (flags, pri, pl, buf);
240} 227}
241 228
… …
268} 255}
269 256
270void 257void
271draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...) 258draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
272{ 259{
273
274 char buf[HUGE_BUF]; 260 char buf[HUGE_BUF];
275 261
276 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 262 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
277 return; 263 return;
278 264
… …
311{ 297{
312 player *pl; 298 player *pl;
313 299
314 for_all_players (pl) 300 for_all_players (pl)
315 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 301 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
316 {
317 new_draw_info (color, 0, pl->ob, str); 302 new_draw_info (color, 0, pl->ob, str);
318 }
319} 303}
320 304
321/** 305/**
322 * Writes to everyone on the map except op1 and op2 306 * Writes to everyone on the map except op1 and op2
323 */ 307 */
… …
327{ 311{
328 player *pl; 312 player *pl;
329 313
330 for_all_players (pl) 314 for_all_players (pl)
331 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) 315 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
332 {
333 new_draw_info (color, 0, pl->ob, str); 316 new_draw_info (color, 0, pl->ob, str);
334 }
335} 317}
336 318
337/** 319/**
338 * Writes to everyone on the specified map 320 * Writes to everyone on the specified map
339 */ 321 */
… …
343{ 325{
344 player *pl; 326 player *pl;
345 327
346 for_all_players (pl) 328 for_all_players (pl)
347 if (pl->ob != NULL && pl->ob->map == map) 329 if (pl->ob != NULL && pl->ob->map == map)
348 {
349 new_draw_info (color, 0, pl->ob, str); 330 new_draw_info (color, 0, pl->ob, str);
350 }
351} 331}
352
353 332
354/** 333/**
355 * This does nothing now. However, in theory, we should probably send 334 * This does nothing now. However, in theory, we should probably send
356 * something to the client and let the client figure out how it might want 335 * something to the client and let the client figure out how it might want
357 * to handle this 336 * to handle this
… …
518 * being nonzero have been changed to check for 1. Also, since 497 * being nonzero have been changed to check for 1. Also, since
519 * map_mark is a char value, putting 2 in should cause no problems. 498 * map_mark is a char value, putting 2 in should cause no problems.
520 * 499 *
521 * This function examines the map the player is on, and determines what 500 * This function examines the map the player is on, and determines what
522 * is visible. 2 is set for walls or objects that blocks view. 1 501 * is visible. 2 is set for walls or objects that blocks view. 1
523 * is for open spaces. map_mark should already have been initialized 502 * is for open spaces. map_mark should already have been initialised
524 * to zero before this is called. 503 * to zero before this is called.
525 * strength is an initial strength*2 rectangular area that we automatically 504 * strength is an initial strength*2 rectangular area that we automatically
526 * see in/penetrate through. 505 * see in/penetrate through.
527 */ 506 */
528 507
… …
570 * The following function is a lot messier than it really should be, 549 * The following function is a lot messier than it really should be,
571 * but there is no real easy solution. 550 * but there is no real easy solution.
572 * 551 *
573 * Mark Wedel 552 * Mark Wedel
574 */ 553 */
575
576void 554void
577draw_magic_map (object *pl) 555draw_magic_map (object *pl)
578{ 556{
579 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); 557 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
580 int xmin, xmax, ymin, ymax; 558 int xmin, xmax, ymin, ymax;
… …
598 xmax = 0; 576 xmax = 0;
599 ymax = 0; 577 ymax = 0;
600 578
601 for (int x = 0; x < MAGIC_MAP_SIZE; x++) 579 for (int x = 0; x < MAGIC_MAP_SIZE; x++)
602 for (int y = 0; y < MAGIC_MAP_SIZE; y++) 580 for (int y = 0; y < MAGIC_MAP_SIZE; y++)
603 if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) 581 if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
604 { 582 {
605 xmin = x < xmin ? x : xmin; 583 xmin = x < xmin ? x : xmin;
606 xmax = x > xmax ? x : xmax; 584 xmax = x > xmax ? x : xmax;
607 ymin = y < ymin ? y : ymin; 585 ymin = y < ymin ? y : ymin;
608 ymax = y > ymax ? y : ymax; 586 ymax = y > ymax ? y : ymax;

Diff Legend

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