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

Comparing deliantra/server/include/map.h (file contents):
Revision 1.133 by root, Tue May 4 22:26:49 2010 UTC vs.
Revision 1.139 by root, Wed May 4 07:41:14 2011 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,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2005 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2005 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
… …
48 * map pointers. 48 * map pointers.
49 */ 49 */
50#define MAGIC_MAP_SIZE 50 50#define MAGIC_MAP_SIZE 50
51#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2 51#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2
52 52
53#define MAP_LAYERS 3 53#define MAP_LAYERS 3
54 54
55// tile map index 55// tile map index
56enum { 56enum {
57 TILE_UP = 0, 57 TILE_NORTH,
58 TILE_RIGHT = 1, 58 TILE_EAST,
59 TILE_SOUTH,
60 TILE_WEST,
61 TILE_UP,
59 TILE_DOWN = 2, 62 TILE_DOWN,
60 TILE_LEFT = 3, 63 TILE_NUM,
61}; 64};
62 65
63/* Values for in_memory below */ 66/* Values for state below */
64enum { 67enum {
65 MAP_ACTIVE, 68 MAP_SWAPPED, // header loaded, nothing else
66 MAP_INACTIVE, // not used atm. 69 MAP_INACTIVE, // in memory, linkable, but not active
67 MAP_SWAPPED, 70 MAP_ACTIVE, // running!
68 MAP_LOADING,
69 MAP_SAVING,
70}; 71};
71 72
72/* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should 73/* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should
73 * really be used, as it is multi tile aware. However, there are some cases 74 * really be used, as it is multi tile aware. However, there are some cases
74 * where it is known the map is not tiled or the values are known 75 * where it is known the map is not tiled or the values are known
… …
136 uint16_t ACC (RW, items_); // saturates at 64k 137 uint16_t ACC (RW, items_); // saturates at 64k
137 uint32_t ACC (RW, volume_); // ~dm³ (not cm³) (factor is actually 1024) 138 uint32_t ACC (RW, volume_); // ~dm³ (not cm³) (factor is actually 1024)
138 uint32_t ACC (RW, smell); // the last count a player was seen here, or 0 139 uint32_t ACC (RW, smell); // the last count a player was seen here, or 0
139 static uint32_t ACC (RW, smellcount); // global smell counter 140 static uint32_t ACC (RW, smellcount); // global smell counter
140 141
141 uint32_t pad1_, pad2_; // pad to 64 bytes on 64 bit systems 142 uint32_t pad1_; // pad to 64 bytes on 64 bit systems
142 143
143//-GPL 144//-GPL
144 145
145 void update_ (); 146 void update_ ();
146 MTH void update () 147 MTH void update ()
… …
263 bool ACC (RW, dirty); /* if true, something was inserted or removed */ 264 bool ACC (RW, dirty); /* if true, something was inserted or removed */
264 bool ACC (RW, no_reset); // must not reset this map 265 bool ACC (RW, no_reset); // must not reset this map
265 bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by 266 bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by
266 * players entering/exiting map 267 * players entering/exiting map
267 */ 268 */
269 uint8 ACC (RW, state); /* If not true, the map has been freed and must
270 * be loaded before used. The map,omap and map_ob
271 * arrays will be allocated when the map is loaded */
268 sint32 ACC (RW, timeout); /* swapout is set to this */ 272 sint32 ACC (RW, timeout); /* swapout is set to this */
269 sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */ 273 sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */
270 uint32 ACC (RW, in_memory); /* If not true, the map has been freed and must
271 * be loaded before used. The map,omap and map_ob
272 * arrays will be allocated when the map is loaded */
273 sint16 players; /* How many players are on this map right now */ 274 sint16 players; /* How many players are on this map right now */
274 uint16 ACC (RW, difficulty); /* What level the player should be to play here */ 275 uint16 ACC (RW, difficulty); /* What level the player should be to play here */
275 276
276 bool ACC (RW, per_player); 277 bool ACC (RW, per_player);
277 bool ACC (RW, per_party); 278 bool ACC (RW, per_party);
… …
288 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */ 289 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */
289 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */ 290 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */
290 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */ 291 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */
291 shstr ACC (RW, msg); /* Message map creator may have left */ 292 shstr ACC (RW, msg); /* Message map creator may have left */
292 shstr ACC (RW, maplore); /* Map lore information */ 293 shstr ACC (RW, maplore); /* Map lore information */
293 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */ 294 shstr ACC (RW, tile_path[TILE_NUM]); /* path to adjoining maps */
294 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ 295 maptile *ACC (RW, tile_map[TILE_NUM]); /* Next map, linked list */
295 shstr ACC (RW, path); /* Filename of the map */ 296 shstr ACC (RW, path); /* Filename of the map */
296 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace 297 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
297 int ACC (RW, max_items); // maximum number of items on a mapspace 298 int ACC (RW, max_items); // maximum number of items on a mapspace
298 299
299//-GPL 300//-GPL
… …
362 ~maptile (); 363 ~maptile ();
363 364
364 void do_destroy (); 365 void do_destroy ();
365 void gather_callbacks (AV *&callbacks, event_type event) const; 366 void gather_callbacks (AV *&callbacks, event_type event) const;
366 367
368 MTH bool linkable () { return state >= MAP_INACTIVE; }
369
367 MTH int size () const { return width * height; } 370 MTH int size () const { return width * height; }
368 371
369 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0); 372 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0);
370 373
371 MTH void touch () { last_access = runtime; } 374 MTH void touch () { last_access = runtime; }
… …
387 { 390 {
388 if (!spaces) 391 if (!spaces)
389 do_load_sync (); 392 do_load_sync ();
390 } 393 }
391 394
392 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP); 395 void make_map_floor (char **layout, const char *floorstyle, random_map_params *RP);
393 bool generate_random_map (random_map_params *RP); 396 bool generate_random_map (random_map_params *RP);
394 397
395 static maptile *find_async (const_utf8_string path, maptile *original = 0, bool load = true);//PERL 398 static maptile *find_async (const_utf8_string path, maptile *original = 0, bool load = true);//PERL
396 static maptile *find_sync (const_utf8_string path, maptile *original = 0);//PERL 399 static maptile *find_sync (const_utf8_string path, maptile *original = 0);//PERL
397 static maptile *find_style_sync (const_utf8_string dir, const_utf8_string file = 0);//PERL 400 static maptile *find_style_sync (const_utf8_string dir, const_utf8_string file = 0);//PERL

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines