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

Diff Legend

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