… | |
… | |
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 | |
256 | void |
255 | void |
257 | maptile::set_object_flag (int flag, int value) |
256 | maptile::set_object_flag (int flag, int value) |
258 | { |
257 | { |
… | |
… | |
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 |
… | |
… | |
1221 | maptile::tile_available (int dir, bool load) |
1221 | maptile::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 | |