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.78 by root, Sun Jul 1 05:00:18 2007 UTC vs.
Revision 1.79 by root, Fri Jul 13 15:54:40 2007 UTC

29#ifndef MAP_H 29#ifndef MAP_H
30#define MAP_H 30#define MAP_H
31 31
32#include <tr1/unordered_map> 32#include <tr1/unordered_map>
33 33
34#include "region.h"
34#include "cfperl.h" 35#include "cfperl.h"
35 36
36/* We set this size - this is to make magic map work properly on 37/* We set this size - this is to make magic map work properly on
37 * tiled maps. There is no requirement that this matches the 38 * tiled maps. There is no requirement that this matches the
38 * tiled maps size - it just seemed like a reasonable value. 39 * tiled maps size - it just seemed like a reasonable value.
186struct maptile : zero_initialised, attachable 187struct maptile : zero_initialised, attachable
187{ 188{
188 sint32 ACC (RW, width), ACC (RW, height); /* Width and height of map. */ 189 sint32 ACC (RW, width), ACC (RW, height); /* Width and height of map. */
189 struct mapspace *spaces; /* Array of spaces on this map */ 190 struct mapspace *spaces; /* Array of spaces on this map */
190 uint8 *regions; /* region index per mapspace, if != 0 */ 191 uint8 *regions; /* region index per mapspace, if != 0 */
191 struct region **regionmap; /* index to region */ 192 region_ptr *regionmap; /* index to region */
192 193
193 tstamp ACC (RW, last_access); /* last time this map was accessed somehow */ 194 tstamp ACC (RW, last_access); /* last time this map was accessed somehow */
194 195
195 shstr ACC (RW, name); /* Name of map as given by its creator */ 196 shstr ACC (RW, name); /* Name of map as given by its creator */
196 struct region *ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by 197 region_ptr ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by
197 * points to the struct containing all the properties of 198 * points to the struct containing all the properties of
198 * the region */ 199 * the region */
199 double ACC (RW, reset_time); 200 double ACC (RW, reset_time);
200 uint32 ACC (RW, reset_timeout); /* How many seconds must elapse before this map 201 uint32 ACC (RW, reset_timeout); /* How many seconds must elapse before this map
201 * should be reset 202 * should be reset

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines