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.38 by root, Wed Apr 25 18:47:51 2007 UTC vs.
Revision 1.54 by root, Wed Nov 4 14:45:30 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25/** 25/**
26 * \file 26 * \file
27 * Basic client output functions. 27 * Basic client output functions.
… …
36#include <sproto.h> 36#include <sproto.h>
37#include <stdarg.h> 37#include <stdarg.h>
38#include <spells.h> 38#include <spells.h>
39#include <skills.h> 39#include <skills.h>
40 40
41#include <cstring>
42
41/** 43/**
42 * Draws a normal message on the client. It is pretty 44 * Draws a normal message on the client. It is pretty
43 * much the same thing as the draw_info above, but takes a color 45 * much the same thing as the draw_info above, but takes a color
44 * parameter. the esrv_drawinfo functions should probably be 46 * parameter. the esrv_drawinfo functions should probably be
45 * replaced with this, just using black as the color. 47 * replaced with this, just using black as the color.
46 */ 48 */
47static void 49static void
48esrv_print_msg (client *ns, int color, const char *str) 50esrv_print_msg (client *ns, int color, const char *str)
49{ 51{
50 ns->send_packet_printf ("drawinfo %d %s", color, str); 52 ns->send_msg (color, "info", str);
51} 53}
52 54
53/** 55/**
54 * Draws an extended message on the client. 56 * Draws an extended message on the client.
55 * ns the socket to send message to 57 * ns the socket to send message to
… …
60 * message The main message 62 * message The main message
61 */ 63 */
62static void 64static void
63esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message) 65esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message)
64{ 66{
65 ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message); 67 ns->send_packet_printf ("drawextinfo %d %u %u %s", color, type, subtype, message);
66} 68}
67 69
68/** 70/**
69 * Frontend for esrv_print_msg 71 * Frontend for esrv_print_msg
70 * \param colr message color 72 * \param colr message color
… …
83 85
84 if (!pl || (pl->type == PLAYER && pl->contr == NULL)) 86 if (!pl || (pl->type == PLAYER && pl->contr == NULL))
85 return; 87 return;
86 88
87 if (pl->type == PLAYER) 89 if (pl->type == PLAYER)
88 esrv_print_msg (pl->contr->ns, colr, (char *) tmp); 90 esrv_print_msg (pl->contr->ns, colr, (char *)tmp);
89} 91}
90 92
91bool 93bool
92client::msg_suppressed (const char *msg) 94client::msg_suppressed (const char *msg)
93{ 95{
… …
138/** 140/**
139 * Sends message to player(s). 141 * Sends message to player(s).
140 * 142 *
141 * flags is various flags - mostly color, plus a few specials. 143 * flags is various flags - mostly color, plus a few specials.
142 * 144 *
143 * pri is priority. It is a little odd - the lower the value, the more 145 * pri is unused.
144 * important it is. Thus, 0 gets sent no matter what. Otherwise, the
145 * value must be less than the listening level that the player has set.
146 * Unfortunately, there is no clear guideline on what each level does what.
147 * 146 *
148 * pl can be passed as NULL - in fact, this will be done if NDI_ALL is set 147 * pl can be passed as NULL - in fact, this will be done if NDI_ALL is set
149 * in the flags. 148 * in the flags.
150 * 149 *
151 * If message is black, and not NDI_UNIQUE, gets sent through output buffers. 150 * If message is black, and not NDI_UNIQUE, gets sent through output buffers.
152 * 151 *
153 */ 152 */
154void 153void
155new_draw_info (int flags, int pri, const object *pl, const char *buf) 154new_draw_info (int flags, int pri, const object *op, const char *buf)
156{ 155{
157 if (flags & NDI_ALL) 156 if (flags & NDI_ALL)
158 { 157 {
159 for_all_players (pl) 158 for_all_players (pl)
160 new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf); 159 new_draw_info (flags & ~NDI_ALL, 0, pl->ob, buf);
161 160 }
161 else
162 {
163 if (!op || !op->contr || !op->contr->ns)
162 return; 164 return;
163 }
164 165
165 if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns)
166 return;
167
168 if (pri >= pl->contr->listening)
169 return;
170
171 if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK 166 if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK
172 || !pl->contr->ns->msg_suppressed (buf)) 167 || !op->contr->ns->msg_suppressed (buf))
173 print_message (flags & NDI_COLOR_MASK, pl, buf); 168 print_message (flags & NDI_COLOR_MASK, op, buf);
169 }
174} 170}
175 171
176/** 172/**
177 * Wrapper for new_draw_info printf-like. 173 * Wrapper for new_draw_info printf-like.
178 * 174 *
… …
182 * client/server bandwidth (client could keep track of various strings 178 * client/server bandwidth (client could keep track of various strings
183 */ 179 */
184void 180void
185new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...) 181new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...)
186{ 182{
187 char buf[HUGE_BUF];
188
189 va_list ap; 183 va_list ap;
190 va_start (ap, format); 184 va_start (ap, format);
191 vsnprintf (buf, HUGE_BUF, format, ap); 185 new_draw_info (flags, pri, pl, vformat (format, ap));
192 va_end (ap); 186 va_end (ap);
193
194 new_draw_info (flags, pri, pl, buf);
195} 187}
196 188
197void 189void
198draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage) 190draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage)
199{ 191{
200 192
201 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 193 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
202 return;
203
204 if (pri >= pl->contr->listening)
205 return; 194 return;
206 195
207 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) 196 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
208 { 197 {
209 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); 198 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
… …
223} 212}
224 213
225void 214void
226draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...) 215draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
227{ 216{
228 char buf[HUGE_BUF]; 217 va_list ap;
218 va_start (ap, new_format);
229 219
230 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL)) 220 if (!pl || !pl->is_player ())
231 return; 221 return;
232 222
233 if (pri >= pl->contr->listening) 223 // TODO: just assume, and rip out?
234 return;
235
236 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) 224 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
237 { 225 {
238 va_list ap;
239
240 LOG (llevDebug, "Non supported extension text type for client.\n"); 226 LOG (llevDebug, "Non supported extension text type for client.\n");
241 va_start (ap, new_format);
242 vsnprintf (buf, HUGE_BUF, old_format, ap);
243 va_end (ap);
244 new_draw_info (flags, pri, pl, buf); 227 new_draw_info (flags, pri, pl, vformat (old_format, ap));
245 return;
246 } 228 }
247 else 229 else
248 { 230 {
249 va_list ap; 231 char *buf = vformat (new_format, ap);
250
251 va_start (ap, new_format);
252 vsnprintf (buf, HUGE_BUF, new_format, ap);
253 va_end (ap);
254 strip_media_tag (buf); 232 strip_media_tag (buf);
255 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf); 233 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);
256 } 234 }
235
236 va_end (ap);
257} 237}
258 238
259/** 239/**
260 * Writes to everyone on the map *except* op. This is useful for emotions. 240 * Writes to everyone on the map *except* op. This is useful for emotions.
261 */ 241 */
262 242
263void 243void
264new_info_map_except (int color, maptile * map, object *op, const char *str) 244new_info_map_except (int color, maptile * map, object *op, const char *str)
265{ 245{
266 for_all_players (pl) 246 for_all_players (pl)
267 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 247 if (pl->ob->map == map && pl->ob != op)
268 new_draw_info (color, 0, pl->ob, str); 248 new_draw_info (color, 0, pl->ob, str);
269} 249}
270 250
271/** 251/**
272 * Writes to everyone on the map except op1 and op2 252 * Writes to everyone on the map except op1 and op2
273 */ 253 */
274
275void 254void
276new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) 255new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
277{ 256{
278 for_all_players (pl) 257 for_all_players (pl)
279 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) 258 if (pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
280 new_draw_info (color, 0, pl->ob, str); 259 new_draw_info (color, 0, pl->ob, str);
281} 260}
282 261
283/** 262/**
284 * Writes to everyone on the specified map 263 * Writes to everyone on the specified map
285 */ 264 */
286
287void 265void
288new_info_map (int color, maptile * map, const char *str) 266new_info_map (int color, maptile * map, const char *str)
289{ 267{
290 for_all_players (pl) 268 for_all_players (pl)
291 if (pl->ob != NULL && pl->ob->map == map) 269 if (pl->ob->map == map)
292 new_draw_info (color, 0, pl->ob, str); 270 new_draw_info (color, 0, pl->ob, str);
293}
294
295/**
296 * This does nothing now. However, in theory, we should probably send
297 * something to the client and let the client figure out how it might want
298 * to handle this
299 */
300void
301clear_win_info (object *op)
302{
303}
304
305/**
306 * Get player's current range attack in obuf.
307 */
308void
309rangetostring (object *pl, char *obuf)
310{
311 switch (pl->contr->shoottype)
312 {
313 case range_none:
314 strcpy (obuf, "Range: nothing");
315 break;
316
317 case range_bow:
318 {
319 object *op;
320
321 for (op = pl->inv; op; op = op->below)
322 if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED))
323 break;
324
325 if (op == NULL)
326 break;
327
328 sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing");
329 }
330 break;
331
332 case range_magic:
333 if (settings.casting_time == TRUE)
334 {
335 if (pl->casting_time > -1)
336 {
337 if (pl->casting_time == 0)
338 sprintf (obuf, "Range: Holding spell (%s)", &pl->spell->name);
339 else
340 sprintf (obuf, "Range: Casting spell (%s)", &pl->spell->name);
341 }
342 else
343 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
344 }
345 else
346 sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
347 break;
348
349 case range_misc:
350 sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none");
351 break;
352
353 /* range_scroll is only used for controlling golems. If the
354 * the player does not have a golem, reset some things.
355 */
356 case range_golem:
357 if (object *golem = pl->contr->ranges[range_golem])
358 sprintf (obuf, "Range: golem (%s)", &golem->name);
359 else
360 {
361 pl->contr->shoottype = range_none;
362 strcpy (obuf, "Range: nothing");
363 }
364 break;
365
366 case range_skill:
367 sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none");
368 break;
369
370 case range_builder:
371 sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0));
372 break;
373
374 default:
375 strcpy (obuf, "Range: illegal");
376 }
377} 271}
378 272
379/** 273/**
380 * Sets player title. 274 * Sets player title.
381 */ 275 */
… …
389 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); 283 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title);
390} 284}
391 285
392// formerly a macro, used only by magic map, so optimised it out 286// formerly a macro, used only by magic map, so optimised it out
393static inline faceidx 287static inline faceidx
394GET_MAP_FACE (maptile *m, int x, int y, int layer) 288GET_MAP_FACE (mapspace &ms, int layer)
395{ 289{
396 if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer)) 290 if (object *op = ms.faces_obj [layer])
397 return op->face; 291 return op->face;
398 else 292 else
399 return 0; 293 return 0;
400} 294}
401 295
… …
411 * for various code values. 305 * for various code values.
412 */ 306 */
413static void 307static void
414magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) 308magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py)
415{ 309{
416 int x, y, dx, dy, mflags;
417 sint16 nx, ny;
418 maptile *mp;
419
420 for (dx = -1; dx <= 1; dx++) 310 for (int dx = -1; dx <= 1; dx++)
421 { 311 {
422 for (dy = -1; dy <= 1; dy++) 312 for (int dy = -1; dy <= 1; dy++)
423 { 313 {
424 x = px + dx; 314 int x = px + dx;
425 y = py + dy; 315 int y = py + dy;
426 316
427 if (FABS (x) >= MAGIC_MAP_HALF || FABS (y) >= MAGIC_MAP_HALF) 317 if (abs (x) >= MAGIC_MAP_HALF || abs (y) >= MAGIC_MAP_HALF)
428 continue; 318 continue;
429 319
430 mp = pl->map; 320 mapxy pos (pl);
431 nx = pl->x + x; 321 pos.move (x, y);
432 ny = pl->y + y;
433 322
434 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 323 if (!pos.normalise ())
435 if (mflags & P_OUT_OF_MAP)
436 continue; 324 continue;
325
326 mapspace &ms = pos.ms ();
437 327
438 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) 328 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
439 { 329 {
330 int mflags = ms.flags ();
331
440 int f = GET_MAP_FACE (mp, nx, ny, 0); 332 int f = GET_MAP_FACE (ms, 0);
441 if (f == blank_face) 333 if (f == blank_face)
442 { 334 {
443 f = GET_MAP_FACE (mp, nx, ny, 1); 335 f = GET_MAP_FACE (ms, 1);
444 if (f == blank_face) 336 if (f == blank_face)
445 f = GET_MAP_FACE (mp, nx, ny, 2); 337 f = GET_MAP_FACE (ms, 2);
446 } 338 }
447 339
448 int magicmap = faces [f].magicmap; 340 int magicmap = faces [f].magicmap;
449 341
450 /* Should probably have P_NO_MAGIC here also, but then shops don't 342 /* Should probably have P_NO_MAGIC here also, but then shops don't
… …
463} 355}
464 356
465/** 357/**
466 * Creates magic map for player. 358 * Creates magic map for player.
467 * 359 *
468 * Note: For improved magic mapping display, the space that blocks 360 * Note: For improved magic mapping display, the space that blocks
469 * the view is now marked with value 2. Any dependencies of map_mark 361 * the view is now marked with value 2. Any dependencies of map_mark
470 * being nonzero have been changed to check for 1. Also, since 362 * being nonzero have been changed to check for 1. Also, since
471 * map_mark is a char value, putting 2 in should cause no problems. 363 * map_mark is a char value, putting 2 in should cause no problems.
472 * 364 *
473 * This function examines the map the player is on, and determines what 365 * This function examines the map the player is on, and determines what
474 * is visible. 2 is set for walls or objects that blocks view. 1 366 * is visible. 2 is set for walls or objects that blocks view. 1
475 * is for open spaces. map_mark should already have been initialised 367 * is for open spaces. map_mark should already have been initialised
476 * to zero before this is called. 368 * to zero before this is called.
477 * strength is an initial strength*2 rectangular area that we automatically 369 * strength is an initial strength*2 rectangular area that we automatically
478 * see in/penetrate through. 370 * see in/penetrate through.
479 */ 371 */
480void 372void
481magic_mapping_mark (object *pl, char *map_mark, int strength) 373magic_mapping_mark (object *pl, char *map_mark, int strength)
482{ 374{
483 int x, y, mflags;
484 sint16 nx, ny;
485 maptile *mp;
486
487 for (x = -strength; x < strength; x++) 375 for (int x = -strength; x < strength; x++)
488 { 376 {
489 for (y = -strength; y < strength; y++) 377 for (int y = -strength; y < strength; y++)
490 { 378 {
491 mp = pl->map; 379 mapxy pos (pl);
492 nx = pl->x + x; 380 pos.move (x, y);
493 ny = pl->y + y;
494 381
495 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 382 if (!pos.normalise ())
496 if (mflags & P_OUT_OF_MAP)
497 continue; 383 continue;
498 384
385 mapspace &ms = pos.ms ();
386
387 int mflags = ms.flags ();
388
499 int f = GET_MAP_FACE (mp, nx, ny, 0); 389 int f = GET_MAP_FACE (ms, 0);
500 if (f == blank_face) 390 if (f == blank_face)
501 { 391 {
502 f = GET_MAP_FACE (mp, nx, ny, 1); 392 f = GET_MAP_FACE (ms, 1);
503 if (f == blank_face) 393 if (f == blank_face)
504 f = GET_MAP_FACE (mp, nx, ny, 2); 394 f = GET_MAP_FACE (ms, 2);
505 } 395 }
506 396
507 int magicmap = faces [f].magicmap; 397 int magicmap = faces [f].magicmap;
508 398
509 if (mflags & P_BLOCKSVIEW) 399 if (mflags & P_BLOCKSVIEW)
… …
571 pl->contr->ns->send_packet (sl); 461 pl->contr->ns->send_packet (sl);
572 462
573 free (map_mark); 463 free (map_mark);
574} 464}
575 465
576/**
577 * Send a kill log record to sockets
578 */
579void
580Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType)
581{
582 size_t len;
583 char buf[MAX_BUF];
584
585 if (With != NULL)
586 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType);
587 else
588 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
589
590 len = strlen (buf);
591}
592

Diff Legend

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