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.131 by root, Thu Oct 4 11:48:06 2007 UTC vs.
Revision 1.135 by root, Sun Apr 20 23:25:09 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"
245 245
246 insert_ob_in_ob (tmp, container); 246 insert_ob_in_ob (tmp, container);
247 tmp = next; 247 tmp = next;
248 } 248 }
249 249
250 /* sum_weight will go through and calculate what all the containers are 250 // go through and calculate what all the containers are carrying.
251 * carrying. 251 //TODO: remove
252 */ 252 container->update_weight ();
253 sum_weight (container);
254} 253}
255 254
256void 255void
257maptile::set_object_flag (int flag, int value) 256maptile::set_object_flag (int flag, int value)
258{ 257{
307bool 306bool
308maptile::_load_objects (object_thawer &f) 307maptile::_load_objects (object_thawer &f)
309{ 308{
310 for (;;) 309 for (;;)
311 { 310 {
312 coroapi::cede_to_tick_every (100); // cede once in a while 311 coroapi::cede_to_tick (); // cede once in a while
313 312
314 switch (f.kw) 313 switch (f.kw)
315 { 314 {
316 case KW_arch: 315 case KW_arch:
317 if (object *op = object::read (f, this)) 316 if (object *op = object::read (f, this))
318 { 317 {
318 // TODO: why?
319 if (op->inv) 319 if (op->inv)
320 sum_weight (op); 320 op->update_weight ();
321 321
322 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height)) 322 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
323 { 323 {
324 // we insert manually because 324 // we insert manually because
325 // a) its way faster 325 // a) its way faster
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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines