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

Diff Legend

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