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.134 by root, Tue Apr 15 14:21:04 2008 UTC vs.
Revision 1.136 by root, Mon Apr 21 23:35:24 2008 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 (©) 2005,2006,2007,2008 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 * Deliantra 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
22 */ 22 */
23 23
24#include <unistd.h> 24#include <unistd.h>
25 25
26#include "global.h" 26#include "global.h"
27#include "funcpoint.h"
28 27
29#include "loader.h" 28#include "loader.h"
30 29
31#include "path.h" 30#include "path.h"
32 31
245 244
246 insert_ob_in_ob (tmp, container); 245 insert_ob_in_ob (tmp, container);
247 tmp = next; 246 tmp = next;
248 } 247 }
249 248
250 /* sum_weight will go through and calculate what all the containers are 249 // go through and calculate what all the containers are carrying.
251 * carrying. 250 //TODO: remove
252 */ 251 container->update_weight ();
253 sum_weight (container);
254} 252}
255 253
256void 254void
257maptile::set_object_flag (int flag, int value) 255maptile::set_object_flag (int flag, int value)
258{ 256{
314 switch (f.kw) 312 switch (f.kw)
315 { 313 {
316 case KW_arch: 314 case KW_arch:
317 if (object *op = object::read (f, this)) 315 if (object *op = object::read (f, this))
318 { 316 {
317 // TODO: why?
319 if (op->inv) 318 if (op->inv)
320 sum_weight (op); 319 op->update_weight ();
321 320
322 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height)) 321 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
323 { 322 {
324 // we insert manually because 323 // we insert manually because
325 // a) its way faster 324 // a) its way faster

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines