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.1 by elmex, Sun Aug 13 17:16:05 2006 UTC vs.
Revision 1.22 by root, Thu Dec 21 06:12:37 2006 UTC

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

Diff Legend

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