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.40 by root, Mon Apr 30 04:25:30 2007 UTC vs.
Revision 1.42 by root, Sun May 6 02:06:03 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 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 *
150 * 150 *
151 * 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.
152 * 152 *
153 */ 153 */
154void 154void
155new_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)
156{ 156{
157 if (flags & NDI_ALL) 157 if (flags & NDI_ALL)
158 { 158 {
159 for_all_players (pl) 159 for_all_players (pl)
160 new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf); 160 new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
161 161 }
162 else
163 {
164 if (!op || !op->contr || !op->contr->ns)
162 return; 165 return;
163 }
164 166
165 if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns)
166 return;
167
168 if (pri >= pl->contr->listening) 167 if (pri >= op->contr->listening)
169 return; 168 return;
170 169
171 if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK 170 if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK
172 || !pl->contr->ns->msg_suppressed (buf)) 171 || !op->contr->ns->msg_suppressed (buf))
173 print_message (flags & NDI_COLOR_MASK, pl, buf); 172 print_message (flags & NDI_COLOR_MASK, op, buf);
173 }
174} 174}
175 175
176/** 176/**
177 * Wrapper for new_draw_info printf-like. 177 * Wrapper for new_draw_info printf-like.
178 * 178 *

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines