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.51 by root, Fri Aug 29 02:07:10 2008 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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / 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;
… …
177 * client/server bandwidth (client could keep track of various strings 164 * client/server bandwidth (client could keep track of various strings
178 */ 165 */
179void 166void
180new_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, ...)
181{ 168{
182 char buf[HUGE_BUF];
183
184 va_list ap; 169 va_list ap;
185 va_start (ap, format); 170 va_start (ap, format);
186 vsnprintf (buf, HUGE_BUF, format, ap); 171 new_draw_info (flags, pri, pl, vformat (format, ap));
187 va_end (ap); 172 va_end (ap);
188
189 new_draw_info (flags, pri, pl, buf);
190}
191
192void
193draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage)
194{
195
196 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
197 return;
198
199 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
200 {
201 char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
202
203 if (buf == NULL)
204 LOG (llevError, "info::draw_ext_info -> Out of memory!");
205 else
206 {
207 strcpy (buf, oldmessage == NULL ? message : oldmessage);
208 strip_media_tag (buf);
209 new_draw_info (flags, pri, pl, buf);
210 free (buf);
211 }
212 }
213 else
214 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, message);
215}
216
217void
218draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
219{
220 char buf[HUGE_BUF];
221
222 if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
223 return;
224
225 if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
226 {
227 va_list ap;
228
229 LOG (llevDebug, "Non supported extension text type for client.\n");
230 va_start (ap, new_format);
231 vsnprintf (buf, HUGE_BUF, old_format, ap);
232 va_end (ap);
233 new_draw_info (flags, pri, pl, buf);
234 return;
235 }
236 else
237 {
238 va_list ap;
239
240 va_start (ap, new_format);
241 vsnprintf (buf, HUGE_BUF, new_format, ap);
242 va_end (ap);
243 strip_media_tag (buf);
244 esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);
245 }
246} 173}
247 174
248/** 175/**
249 * 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.
250 */ 177 */
251
252void 178void
253new_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)
254{ 180{
255 for_all_players (pl) 181 for_all_players (pl)
256 if (pl->ob->map == map && pl->ob != op) 182 if (pl->ob->map == map && pl->ob != op)
257 new_draw_info (color, 0, pl->ob, str);
258}
259
260/**
261 * Writes to everyone on the map except op1 and op2
262 */
263void
264new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
265{
266 for_all_players (pl)
267 if (pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
268 new_draw_info (color, 0, pl->ob, str); 183 new_draw_info (color, 0, pl->ob, str);
269} 184}
270 185
271/** 186/**
272 * Writes to everyone on the specified map 187 * Writes to everyone on the specified map
… …
292 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);
293} 208}
294 209
295// 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
296static inline faceidx 211static inline faceidx
297GET_MAP_FACE (maptile *m, int x, int y, int layer) 212GET_MAP_FACE (mapspace &ms, int layer)
298{ 213{
299 if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer)) 214 if (object *op = ms.faces_obj [layer])
300 return op->face; 215 return op->face;
301 else 216 else
302 return 0; 217 return 0;
303} 218}
304 219
… …
314 * for various code values. 229 * for various code values.
315 */ 230 */
316static void 231static void
317magic_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)
318{ 233{
319 int x, y, dx, dy, mflags;
320 sint16 nx, ny;
321 maptile *mp;
322
323 for (dx = -1; dx <= 1; dx++) 234 for (int dx = -1; dx <= 1; dx++)
324 { 235 {
325 for (dy = -1; dy <= 1; dy++) 236 for (int dy = -1; dy <= 1; dy++)
326 { 237 {
327 x = px + dx; 238 int x = px + dx;
328 y = py + dy; 239 int y = py + dy;
329 240
330 if (FABS (x) >= MAGIC_MAP_HALF || FABS (y) >= MAGIC_MAP_HALF) 241 if (abs (x) >= MAGIC_MAP_HALF || abs (y) >= MAGIC_MAP_HALF)
331 continue; 242 continue;
332 243
333 mp = pl->map; 244 mapxy pos (pl);
334 nx = pl->x + x; 245 pos.move (x, y);
335 ny = pl->y + y;
336 246
337 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 247 if (!pos.normalise ())
338 if (mflags & P_OUT_OF_MAP)
339 continue; 248 continue;
249
250 mapspace &ms = pos.ms ();
340 251
341 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)
342 { 253 {
254 int mflags = ms.flags ();
255
343 int f = GET_MAP_FACE (mp, nx, ny, 0); 256 int f = GET_MAP_FACE (ms, 0);
344 if (f == blank_face) 257 if (f == blank_face)
345 { 258 {
346 f = GET_MAP_FACE (mp, nx, ny, 1); 259 f = GET_MAP_FACE (ms, 1);
347 if (f == blank_face) 260 if (f == blank_face)
348 f = GET_MAP_FACE (mp, nx, ny, 2); 261 f = GET_MAP_FACE (ms, 2);
349 } 262 }
350 263
351 int magicmap = faces [f].magicmap; 264 int magicmap = faces [f].magicmap;
352 265
353 /* 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
… …
366} 279}
367 280
368/** 281/**
369 * Creates magic map for player. 282 * Creates magic map for player.
370 * 283 *
371 * Note: For improved magic mapping display, the space that blocks 284 * Note: For improved magic mapping display, the space that blocks
372 * 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
373 * being nonzero have been changed to check for 1. Also, since 286 * being nonzero have been changed to check for 1. Also, since
374 * 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.
375 * 288 *
376 * 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
377 * 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
378 * is for open spaces. map_mark should already have been initialised 291 * is for open spaces. map_mark should already have been initialised
379 * to zero before this is called. 292 * to zero before this is called.
380 * strength is an initial strength*2 rectangular area that we automatically 293 * strength is an initial strength*2 rectangular area that we automatically
381 * see in/penetrate through. 294 * see in/penetrate through.
382 */ 295 */
383void 296static void
384magic_mapping_mark (object *pl, char *map_mark, int strength) 297magic_mapping_mark (object *pl, char *map_mark, int strength)
385{ 298{
386 int x, y, mflags;
387 sint16 nx, ny;
388 maptile *mp;
389
390 for (x = -strength; x < strength; x++) 299 for (int x = -strength; x < strength; x++)
391 { 300 {
392 for (y = -strength; y < strength; y++) 301 for (int y = -strength; y < strength; y++)
393 { 302 {
394 mp = pl->map; 303 mapxy pos (pl);
395 nx = pl->x + x; 304 pos.move (x, y);
396 ny = pl->y + y;
397 305
398 mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); 306 if (!pos.normalise ())
399 if (mflags & P_OUT_OF_MAP)
400 continue; 307 continue;
401 308
309 mapspace &ms = pos.ms ();
310
311 int mflags = ms.flags ();
312
402 int f = GET_MAP_FACE (mp, nx, ny, 0); 313 int f = GET_MAP_FACE (ms, 0);
403 if (f == blank_face) 314 if (f == blank_face)
404 { 315 {
405 f = GET_MAP_FACE (mp, nx, ny, 1); 316 f = GET_MAP_FACE (ms, 1);
406 if (f == blank_face) 317 if (f == blank_face)
407 f = GET_MAP_FACE (mp, nx, ny, 2); 318 f = GET_MAP_FACE (ms, 2);
408 } 319 }
409 320
410 int magicmap = faces [f].magicmap; 321 int magicmap = faces [f].magicmap;
411 322
412 if (mflags & P_BLOCKSVIEW) 323 if (mflags & P_BLOCKSVIEW)
… …
429 * Mark Wedel 340 * Mark Wedel
430 */ 341 */
431void 342void
432draw_magic_map (object *pl) 343draw_magic_map (object *pl)
433{ 344{
434 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
435 int xmin, xmax, ymin, ymax; 345 int xmin, xmax, ymin, ymax;
436 346
437 if (pl->type != PLAYER) 347 if (pl->type != PLAYER)
438 { 348 {
439 LOG (llevError, "Non player object called draw_map.\n"); 349 LOG (llevError, "Non player object called draw_map.\n");
440 return; 350 return;
441 } 351 }
352
353 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
354 assert(("Out of memory!", map_mark != NULL));
442 355
443 /* First, we figure out what spaces are 'reachable' by the player */ 356 /* First, we figure out what spaces are 'reachable' by the player */
444 magic_mapping_mark (pl, map_mark, 3); 357 magic_mapping_mark (pl, map_mark, 3);
445 358
446 /* We now go through and figure out what spaces have been 359 /* We now go through and figure out what spaces have been

Diff Legend

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