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

Diff Legend

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