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.84 by root, Mon Feb 5 01:24:45 2007 UTC vs.
Revision 1.85 by root, Wed Feb 7 23:50:01 2007 UTC

20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
23 */ 23 */
24 24
25#include <global.h>
26#include <funcpoint.h>
27
28#include <loader.h>
29#include <unistd.h> 25#include <unistd.h>
26
27#include "global.h"
28#include "funcpoint.h"
29
30#include "loader.h"
30 31
31#include "path.h" 32#include "path.h"
32 33
33/* 34/*
34 * This makes a path absolute outside the world of Crossfire. 35 * This makes a path absolute outside the world of Crossfire.
568maptile::maptile () 569maptile::maptile ()
569{ 570{
570 in_memory = MAP_SWAPPED; 571 in_memory = MAP_SWAPPED;
571 572
572 /* The maps used to pick up default x and y values from the 573 /* The maps used to pick up default x and y values from the
573 * map archetype. Mimic that behaviour. 574 * map archetype. Mimic that behaviour.
574 */ 575 */
575 width = 16; 576 width = 16;
576 height = 16; 577 height = 16;
577 reset_timeout = 0;
578 timeout = 300; 578 timeout = 300;
579 enter_x = 0; 579 max_nrof = 1000; // 1000 items of anything
580 enter_y = 0; 580 max_volume = 2000000; // 2m³
581} 581}
582 582
583maptile::maptile (int w, int h) 583maptile::maptile (int w, int h)
584{ 584{
585 in_memory = MAP_SWAPPED; 585 in_memory = MAP_SWAPPED;
1276 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1276 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1277 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1277 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1278 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1278 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1279} 1279}
1280 1280
1281uint64
1282mapspace::volume () const
1283{
1284 uint64 vol = 0;
1285
1286 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1287 vol += op->volume ();
1288
1289 return vol;
1290}
1291
1281/* this updates the orig_map->tile_map[tile_num] value after finding 1292/* this updates the orig_map->tile_map[tile_num] value after finding
1282 * the map. It also takes care of linking back the freshly found 1293 * the map. It also takes care of linking back the freshly found
1283 * maps tile_map values if it tiles back to this one. It returns 1294 * maps tile_map values if it tiles back to this one. It returns
1284 * the value of orig_map->tile_map[tile_num]. 1295 * the value of orig_map->tile_map[tile_num].
1285 */ 1296 */
1693 return default_region; 1704 return default_region;
1694 1705
1695 return ::region::default_region (); 1706 return ::region::default_region ();
1696} 1707}
1697 1708
1709

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines