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

Diff Legend

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