ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/map.C
(Generate patch)

Comparing deliantra/server/common/map.C (file contents):
Revision 1.130 by root, Sun Sep 30 20:22:14 2007 UTC vs.
Revision 1.134 by root, Tue Apr 15 14:21:04 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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,
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 GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <unistd.h> 24#include <unistd.h>
25 25
26#include "global.h" 26#include "global.h"
307bool 307bool
308maptile::_load_objects (object_thawer &f) 308maptile::_load_objects (object_thawer &f)
309{ 309{
310 for (;;) 310 for (;;)
311 { 311 {
312 coroapi::cede_to_tick_every (100); // cede once in a while 312 coroapi::cede_to_tick (); // cede once in a while
313 313
314 switch (f.kw) 314 switch (f.kw)
315 { 315 {
316 case KW_arch: 316 case KW_arch:
317 if (object *op = object::read (f, this)) 317 if (object *op = object::read (f, this))
1221maptile::tile_available (int dir, bool load) 1221maptile::tile_available (int dir, bool load)
1222{ 1222{
1223 if (!tile_path[dir]) 1223 if (!tile_path[dir])
1224 return 0; 1224 return 0;
1225 1225
1226 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY)) 1226 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1227 return 1; 1227 return 1;
1228 1228
1229 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1229 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1230 return 1; 1230 return 1;
1231 1231
1620{ 1620{
1621 if (!sound) 1621 if (!sound)
1622 return; 1622 return;
1623 1623
1624 for_all_players (pl) 1624 for_all_players (pl)
1625 if (pl->observe->map == this) 1625 if (pl->ob->map == this)
1626 if (client *ns = pl->ns) 1626 if (client *ns = pl->ns)
1627 { 1627 {
1628 int dx = x - pl->observe->x; 1628 int dx = x - pl->ob->x;
1629 int dy = y - pl->observe->y; 1629 int dy = y - pl->ob->y;
1630 1630
1631 int distance = idistance (dx, dy); 1631 int distance = idistance (dx, dy);
1632 1632
1633 if (distance <= MAX_SOUND_DISTANCE) 1633 if (distance <= MAX_SOUND_DISTANCE)
1634 ns->play_sound (sound, dx, dy); 1634 ns->play_sound (sound, dx, dy);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines