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.58 by root, Fri Nov 6 13:31:48 2009 UTC vs.
Revision 1.66 by root, Mon Oct 29 23:55:57 2012 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,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * 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 Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25/** 25/**
26 * \file 26 * \file
… …
93 for (msg_buf *buf = msgbuf; buf < msgbuf + MSG_BUF_COUNT; ++buf) 93 for (msg_buf *buf = msgbuf; buf < msgbuf + MSG_BUF_COUNT; ++buf)
94 { 94 {
95 if (len == buf->len && !memcmp (msg, buf->msg, len)) 95 if (len == buf->len && !memcmp (msg, buf->msg, len))
96 { 96 {
97 // found matching buf, see if expired 97 // found matching buf, see if expired
98 if (buf->expire <= pticks || !buf->count) 98 if (buf->expire <= server_tick || !buf->count)
99 { 99 {
100 // yes, take over matching buffer, print 100 // yes, take over matching buffer, print
101 buf->expire = pticks + pl->outputs_sync; 101 buf->expire = server_tick + pl->outputs_sync;
102 buf->count = pl->outputs_count; 102 buf->count = pl->outputs_count;
103 103
104 return false; 104 return false;
105 } 105 }
106 106
… …
112 if (lru->expire > buf->expire) 112 if (lru->expire > buf->expire)
113 lru = buf; 113 lru = buf;
114 } 114 }
115 115
116 // new message, evoke oldest buffer 116 // new message, evoke oldest buffer
117 lru->expire = pticks + pl->outputs_sync; 117 lru->expire = server_tick + pl->outputs_sync;
118 lru->count = pl->outputs_count; 118 lru->count = pl->outputs_count;
119 lru->len = len; 119 lru->len = len;
120 memcpy (lru->msg, msg, len); 120 memcpy (lru->msg, msg, len);
121 121
122 return false; 122 return false;
… …
339 * Mark Wedel 339 * Mark Wedel
340 */ 340 */
341void 341void
342draw_magic_map (object *pl) 342draw_magic_map (object *pl)
343{ 343{
344 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
345 int xmin, xmax, ymin, ymax; 344 int xmin, xmax, ymin, ymax;
346 345
347 if (pl->type != PLAYER) 346 if (pl->type != PLAYER)
348 { 347 {
349 LOG (llevError, "Non player object called draw_map.\n"); 348 LOG (llevError, "Non player object called draw_map.\n");
350 return; 349 return;
351 } 350 }
351
352 char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
353 assert(("Out of memory!", map_mark != NULL));
352 354
353 /* First, we figure out what spaces are 'reachable' by the player */ 355 /* First, we figure out what spaces are 'reachable' by the player */
354 magic_mapping_mark (pl, map_mark, 3); 356 magic_mapping_mark (pl, map_mark, 3);
355 357
356 /* We now go through and figure out what spaces have been 358 /* We now go through and figure out what spaces have been

Diff Legend

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