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.4 by root, Sun Sep 3 00:18:43 2006 UTC vs.
Revision 1.12 by pippijn, Sat Dec 9 17:28:37 2006 UTC

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

Diff Legend

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