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

Diff Legend

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