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.47 by root, Thu Nov 8 19:43:29 2007 UTC vs.
Revision 1.69 by root, Sat Nov 17 23:40:05 2018 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify 9 * 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 10 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 20 * and the GNU General Public License along with this program. If not, see
21 * <http://www.gnu.org/licenses/>.
20 * 22 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 24 */
23 25
24/** 26/**
25 * \file 27 * \file
… …
38#include <skills.h> 40#include <skills.h>
39 41
40#include <cstring> 42#include <cstring>
41 43
42/** 44/**
43 * Draws a normal message on the client. It is pretty 45 * Draws a normal message on the client. It is pretty
44 * much the same thing as the draw_info above, but takes a color 46 * much the same thing as the draw_info above, but takes a color
45 * parameter. the esrv_drawinfo functions should probably be 47 * parameter. the esrv_drawinfo functions should probably be
46 * replaced with this, just using black as the color. 48 * replaced with this, just using black as the color.
47 */ 49 */
48static void 50static void
49esrv_print_msg (client *ns, int color, const char *str) 51esrv_print_msg (client *ns, int color, const char *str)
50{ 52{
51 ns->send_msg (color, "info", str); 53 ns->send_msg (color, "info", str);
52}
53
54/**
55 * Draws an extended message on the client.
56 * ns the socket to send message to
57 * color color informations (used mainly if client does not support message type)
58 * type,
59 * subtype type and subtype of text message
60 * intro Intro message to send with main message if client does not support the message type
61 * message The main message
62 */
63static void
64esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message)
65{
66 ns->send_packet_printf ("drawextinfo %d %u %u %s", color, type, subtype, message);
67} 54}
68 55
69/** 56/**
70 * Frontend for esrv_print_msg 57 * Frontend for esrv_print_msg
71 * \param colr message color 58 * \param colr message color
… …
107 for (msg_buf *buf = msgbuf; buf < msgbuf + MSG_BUF_COUNT; ++buf) 94 for (msg_buf *buf = msgbuf; buf < msgbuf + MSG_BUF_COUNT; ++buf)
108 { 95 {
109 if (len == buf->len && !memcmp (msg, buf->msg, len)) 96 if (len == buf->len && !memcmp (msg, buf->msg, len))
110 { 97 {
111 // found matching buf, see if expired 98 // found matching buf, see if expired
112 if (buf->expire <= pticks || !buf->count) 99 if (buf->expire <= server_tick || !buf->count)
113 { 100 {
114 // yes, take over matching buffer, print 101 // yes, take over matching buffer, print
115 buf->expire = pticks + pl->outputs_sync; 102 buf->expire = server_tick + pl->outputs_sync;
116 buf->count = pl->outputs_count; 103 buf->count = pl->outputs_count;
117 104
118 return false; 105 return false;
119 } 106 }
120 107
… …
126 if (lru->expire > buf->expire) 113 if (lru->expire > buf->expire)
127 lru = buf; 114 lru = buf;
128 } 115 }
129 116
130 // new message, evoke oldest buffer 117 // new message, evoke oldest buffer
131 lru->expire = pticks + pl->outputs_sync; 118 lru->expire = server_tick + pl->outputs_sync;
132 lru->count = pl->outputs_count; 119 lru->count = pl->outputs_count;
133 lru->len = len; 120 lru->len = len;
134 memcpy (lru->msg, msg, len); 121 memcpy (lru->msg, msg, len);
135 122
136 return false; 123 return false;
… …
139/** 126/**
140 * Sends message to player(s). 127 * Sends message to player(s).
141 * 128 *
142 * flags is various flags - mostly color, plus a few specials. 129 * flags is various flags - mostly color, plus a few specials.
143 * 130 *
144 * pri is priority. It is a little odd - the lower the value, the more 131 * pri is unused.
145 * important it is. Thus, 0 gets sent no matter what. Otherwise, the
146 * value must be less than the listening level that the player has set.
147 * Unfortunately, there is no clear guideline on what each level does what.
148 * 132 *
149 * pl can be passed as NULL - in fact, this will be done if NDI_ALL is set 133 * pl can be passed as NULL - in fact, this will be done if NDI_ALL is set
150 * in the flags. 134 * in the flags.
151 * 135 *
152 * If message is black, and not NDI_UNIQUE, gets sent through output buffers. 136 * If message is black, and not NDI_UNIQUE, gets sent through output buffers.
… …
156new_draw_info (int flags, int pri, const object *op, const char *buf) 140new_draw_info (int flags, int pri, const object *op, const char *buf)
157{ 141{
158 if (flags & NDI_ALL) 142 if (flags & NDI_ALL)
159 { 143 {
160 for_all_players (pl) 144 for_all_players (pl)
161 new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf); 145 new_draw_info (flags & ~NDI_ALL, 0, pl->ob, buf);
162 } 146 }
163 else 147 else
164 { 148 {
165 if (!op || !op->contr || !op->contr->ns) 149 if (!op || !op->contr || !op->contr->ns)
166 return;
167
168 if (pri >= op->contr->listening)
169 return; 150 return;
170 151
171 if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK 152 if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK
172 || !op->contr->ns->msg_suppressed (buf)) 153 || !op->contr->ns->msg_suppressed (buf))
173 print_message (flags & NDI_COLOR_MASK, op, buf); 154 print_message (flags & NDI_COLOR_MASK, op, buf);
… …
183 * client/server bandwidth (client could keep track of various strings 164 * client/server bandwidth (client could keep track of various strings
184 */ 165 */
185void 166void
186new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...) 167new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...)
187{ 168{
188 char buf[HUGE_BUF];
189
190 va_list ap; 169 va_list ap;
191 va_start (ap, format); 170 va_start (ap, format);
192 vsnprintf (buf, HUGE_BUF, format, ap); 171 new_draw_info (flags, pri, pl, vformat (format, ap));
193 va_end (ap); 172 va_end (ap);
194
195 new_draw_info (flags, pri, pl, buf);
196}
197
198void
199draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage)
200{
201
202 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
203 return;
204
205 if (pri >= pl->contr->listening)
206 return;
207
208 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
209 {
210 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
211
212 if (buf == NULL)
213 LOG (llevError, "info::draw_ext_info -> Out of memory!");
214 else
215 {
216 strcpy (buf, oldmessage == NULL ? message : oldmessage);
217 strip_media_tag (buf);
218 new_draw_info (flags, pri, pl, buf);
219 free (buf);
220 }
221 }
222 else
223 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, message);
224}
225
226void
227draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
228{
229 char buf[HUGE_BUF];
230
231 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
232 return;
233
234 if (pri >= pl->contr->listening)
235 return;
236
237 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
238 {
239 va_list ap;
240
241 LOG (llevDebug, "Non supported extension text type for client.\n");
242 va_start (ap, new_format);
243 vsnprintf (buf, HUGE_BUF, old_format, ap);
244 va_end (ap);
245 new_draw_info (flags, pri, pl, buf);
246 return;
247 }
248 else
249 {
250 va_list ap;
251
252 va_start (ap, new_format);
253 vsnprintf (buf, HUGE_BUF, new_format, ap);
254 va_end (ap);
255 strip_media_tag (buf);
256 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);
257 }
258} 173}
259 174
260/** 175/**
261 * Writes to everyone on the map *except* op. This is useful for emotions. 176 * Writes to everyone on the map *except* op. This is useful for emotions.
262 */ 177 */
263
264void 178void
265new_info_map_except (int color, maptile * map, object *op, const char *str) 179new_info_map_except (int color, maptile * map, object *op, const char *str)
266{ 180{
267 for_all_players (pl) 181 for_all_players (pl)
268 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) 182 if (pl->ob->map == map && pl->ob != op)
269 new_draw_info (color, 0, pl->ob, str); 183 new_draw_info (color, 0, pl->ob, str);
270} 184}
271 185
272/** 186/**
273 * Writes to everyone on the map except op1 and op2 187 * Writes to everyone on the specified map
274 */ 188 */
275void 189void
276new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) 190new_info_map (int color, maptile * map, const char *str)
277{ 191{
278 for_all_players (pl) 192 for_all_players (pl)
279 if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
280 new_draw_info (color, 0, pl->ob, str);
281}
282
283/**
284 * Writes to everyone on the specified map
285 */
286void
287new_info_map (int color, maptile * map, const char *str)
288{
289 for_all_players (pl)
290 if (pl->ob != NULL && pl->ob->map == map) 193 if (pl->ob->map == map)
291 new_draw_info (color, 0, pl->ob, str); 194 new_draw_info (color, 0, pl->ob, str);
292} 195}
293 196
294/** 197/**
295 * Sets player title. 198 * Sets player title.
… …
304 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); 207 sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title);
305} 208}
306 209
307// formerly a macro, used only by magic map, so optimised it out 210// formerly a macro, used only by magic map, so optimised it out
308static inline faceidx 211static inline faceidx
309GET_MAP_FACE (maptile *m, int x, int y, int layer) 212GET_MAP_FACE (mapspace &ms, int layer)
310{ 213{
311 if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer)) 214 if (object *op = ms.faces_obj [layer])
312 return op->face; 215 return op->face;
313 else 216 else
314 return 0; 217 return 0;
315} 218}
316 219
… …
326 * for various code values. 229 * for various code values.
327 */ 230 */
328static void 231static void
329magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) 232magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py)
330{ 233{
331 int x, y, dx, dy, mflags;
332 sint16 nx, ny;
333 maptile *mp;
334
335 for (dx = -1; dx <= 1; dx++) 234 for (int dx = -1; dx <= 1; dx++)
336 { 235 {
337 for (dy = -1; dy <= 1; dy++) 236 for (int dy = -1; dy <= 1; dy++)
338 { 237 {
339 x = px + dx; 238 int x = px + dx;
340 y = py + dy; 239 int y = py + dy;
341 240
342 if (FABS (x) >= MAGIC_MAP_HALF || FABS (y) >= MAGIC_MAP_HALF) 241 if (abs (x) >= MAGIC_MAP_HALF || abs (y) >= MAGIC_MAP_HALF)
343 continue; 242 continue;
344 243
345 mp = pl->map; 244 mapxy pos (pl);
346 nx = pl->x + x; 245 pos.move (x, y);
347 ny = pl->y + y;
348 246
349 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 247 if (!pos.normalise ())
350 if (mflags & P_OUT_OF_MAP)
351 continue; 248 continue;
249
250 mapspace &ms = pos.ms ();
352 251
353 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) 252 if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
354 { 253 {
254 int mflags = ms.flags ();
255
355 int f = GET_MAP_FACE (mp, nx, ny, 0); 256 int f = GET_MAP_FACE (ms, 0);
356 if (f == blank_face) 257 if (f == blank_face)
357 { 258 {
358 f = GET_MAP_FACE (mp, nx, ny, 1); 259 f = GET_MAP_FACE (ms, 1);
359 if (f == blank_face) 260 if (f == blank_face)
360 f = GET_MAP_FACE (mp, nx, ny, 2); 261 f = GET_MAP_FACE (ms, 2);
361 } 262 }
362 263
363 int magicmap = faces [f].magicmap; 264 int magicmap = faces [f].magicmap;
364 265
365 /* Should probably have P_NO_MAGIC here also, but then shops don't 266 /* Should probably have P_NO_MAGIC here also, but then shops don't
… …
378} 279}
379 280
380/** 281/**
381 * Creates magic map for player. 282 * Creates magic map for player.
382 * 283 *
383 * Note: For improved magic mapping display, the space that blocks 284 * Note: For improved magic mapping display, the space that blocks
384 * the view is now marked with value 2. Any dependencies of map_mark 285 * the view is now marked with value 2. Any dependencies of map_mark
385 * being nonzero have been changed to check for 1. Also, since 286 * being nonzero have been changed to check for 1. Also, since
386 * map_mark is a char value, putting 2 in should cause no problems. 287 * map_mark is a char value, putting 2 in should cause no problems.
387 * 288 *
388 * This function examines the map the player is on, and determines what 289 * This function examines the map the player is on, and determines what
389 * is visible. 2 is set for walls or objects that blocks view. 1 290 * is visible. 2 is set for walls or objects that blocks view. 1
390 * is for open spaces. map_mark should already have been initialised 291 * is for open spaces. map_mark should already have been initialised
391 * to zero before this is called. 292 * to zero before this is called.
392 * strength is an initial strength*2 rectangular area that we automatically 293 * strength is an initial strength*2 rectangular area that we automatically
393 * see in/penetrate through. 294 * see in/penetrate through.
394 */ 295 */
395void 296static void
396magic_mapping_mark (object *pl, char *map_mark, int strength) 297magic_mapping_mark (object *pl, char *map_mark, int strength)
397{ 298{
398 int x, y, mflags;
399 sint16 nx, ny;
400 maptile *mp;
401
402 for (x = -strength; x < strength; x++) 299 for (int x = -strength; x < strength; x++)
403 { 300 {
404 for (y = -strength; y < strength; y++) 301 for (int y = -strength; y < strength; y++)
405 { 302 {
406 mp = pl->map; 303 mapxy pos (pl);
407 nx = pl->x + x; 304 pos.move (x, y);
408 ny = pl->y + y;
409 305
410 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 306 if (!pos.normalise ())
411 if (mflags & P_OUT_OF_MAP)
412 continue; 307 continue;
413 308
309 mapspace &ms = pos.ms ();
310
311 int mflags = ms.flags ();
312
414 int f = GET_MAP_FACE (mp, nx, ny, 0); 313 int f = GET_MAP_FACE (ms, 0);
415 if (f == blank_face) 314 if (f == blank_face)
416 { 315 {
417 f = GET_MAP_FACE (mp, nx, ny, 1); 316 f = GET_MAP_FACE (ms, 1);
418 if (f == blank_face) 317 if (f == blank_face)
419 f = GET_MAP_FACE (mp, nx, ny, 2); 318 f = GET_MAP_FACE (ms, 2);
420 } 319 }
421 320
422 int magicmap = faces [f].magicmap; 321 int magicmap = faces [f].magicmap;
423 322
424 if (mflags & P_BLOCKSVIEW) 323 if (mflags & P_BLOCKSVIEW)
… …
441 * Mark Wedel 340 * Mark Wedel
442 */ 341 */
443void 342void
444draw_magic_map (object *pl) 343draw_magic_map (object *pl)
445{ 344{
446 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
447 int xmin, xmax, ymin, ymax; 345 int xmin, xmax, ymin, ymax;
448 346
449 if (pl->type != PLAYER) 347 if (pl->type != PLAYER)
450 { 348 {
451 LOG (llevError, "Non player object called draw_map.\n"); 349 LOG (llevError, "Non player object called draw_map.\n");
452 return; 350 return;
453 } 351 }
352
353 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
354 assert(("Out of memory!", map_mark != NULL));
454 355
455 /* First, we figure out what spaces are 'reachable' by the player */ 356 /* First, we figure out what spaces are 'reachable' by the player */
456 magic_mapping_mark (pl, map_mark, 3); 357 magic_mapping_mark (pl, map_mark, 3);
457 358
458 /* We now go through and figure out what spaces have been 359 /* We now go through and figure out what spaces have been
… …
486 pl->contr->ns->send_packet (sl); 387 pl->contr->ns->send_packet (sl);
487 388
488 free (map_mark); 389 free (map_mark);
489} 390}
490 391
491/**
492 * Send a kill log record to sockets
493 */
494void
495Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType)
496{
497 size_t len;
498 char buf[MAX_BUF];
499
500 if (With != NULL)
501 snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType);
502 else
503 snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
504
505 len = strlen (buf);
506}
507

Diff Legend

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