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.66 by root, Wed Feb 7 23:50:01 2007 UTC vs.
Revision 1.73 by root, Sat Apr 14 07:23:00 2007 UTC

… …
65// all those macros are herewith declared legacy 65// all those macros are herewith declared legacy
66#define GET_MAP_FLAGS(M,X,Y) (M)->at((X),(Y)).flags () 66#define GET_MAP_FLAGS(M,X,Y) (M)->at((X),(Y)).flags ()
67#define GET_MAP_LIGHT(M,X,Y) (M)->at((X),(Y)).light 67#define GET_MAP_LIGHT(M,X,Y) (M)->at((X),(Y)).light
68#define GET_MAP_OB(M,X,Y) (M)->at((X),(Y)).bot 68#define GET_MAP_OB(M,X,Y) (M)->at((X),(Y)).bot
69#define GET_MAP_TOP(M,X,Y) (M)->at((X),(Y)).top 69#define GET_MAP_TOP(M,X,Y) (M)->at((X),(Y)).top
70#define GET_MAP_FACE(M,X,Y,L) (M)->at((X),(Y)).faces[L]
71#define GET_MAP_FACE_OBJ(M,X,Y,L) (M)->at((X),(Y)).faces_obj[L] 70#define GET_MAP_FACE_OBJ(M,X,Y,L) (M)->at((X),(Y)).faces_obj[L]
72#define GET_MAP_MOVE_BLOCK(M,X,Y) (M)->at((X),(Y)).move_block 71#define GET_MAP_MOVE_BLOCK(M,X,Y) (M)->at((X),(Y)).move_block
73#define GET_MAP_MOVE_SLOW(M,X,Y) (M)->at((X),(Y)).move_slow 72#define GET_MAP_MOVE_SLOW(M,X,Y) (M)->at((X),(Y)).move_slow
74#define GET_MAP_MOVE_ON(M,X,Y) (M)->at((X),(Y)).move_on 73#define GET_MAP_MOVE_ON(M,X,Y) (M)->at((X),(Y)).move_on
75#define GET_MAP_MOVE_OFF(M,X,Y) (M)->at((X),(Y)).move_off 74#define GET_MAP_MOVE_OFF(M,X,Y) (M)->at((X),(Y)).move_off
… …
118 * to extend information about a space. 117 * to extend information about a space.
119 */ 118 */
120struct mapspace 119struct mapspace
121{ 120{
122 object *bot, *top; /* lowest/highest object on this space */ 121 object *bot, *top; /* lowest/highest object on this space */
123 facetile *faces[MAP_LAYERS]; /* faces for the 3 layers */
124 object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */ 122 object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */
125 uint8 flags_; /* flags about this space (see the P_ values above) */ 123 uint8 flags_; /* flags about this space (see the P_ values above) */
126 sint8 light; /* How much light this space provides */ 124 sint8 light; /* How much light this space provides */
127 MoveType move_block; /* What movement types this space blocks */ 125 MoveType move_block; /* What movement types this space blocks */
128 MoveType move_slow; /* What movement types this space slows */ 126 MoveType move_slow; /* What movement types this space slows */
… …
166 */ 164 */
167INTERFACE_CLASS (region) 165INTERFACE_CLASS (region)
168struct region : zero_initialised 166struct region : zero_initialised
169{ 167{
170 shstr ACC (RW, name); /* Shortend name of the region as maps refer to it */ 168 shstr ACC (RW, name); /* Shortend name of the region as maps refer to it */
169 shstr ACC (RW, match); // a perl regex that matches map paths
171 region *ACC (RW, parent); /* 170 region *ACC (RW, parent); /*
172 * Pointer to the region that is a parent of the current 171 * Pointer to the region that is a parent of the current
173 * region, if a value isn't defined in the current region 172 * region, if a value isn't defined in the current region
174 * we traverse this series of pointers until it is. 173 * we traverse this series of pointers until it is.
175 */ 174 */
176 shstr ACC (RW, longname); /* Official title of the region, this might be defined 175 shstr ACC (RW, longname); /* Official title of the region, this might be defined
177 * to be the same as name*/ 176 * to be the same as name*/
178 shstr ACC (RW, msg); /* the description of the region */ 177 shstr ACC (RW, msg); /* the description of the region */
179 shstr ACC (RW, jailmap); /*where a player that is arrested in this region should be imprisoned. */ 178 shstr ACC (RW, jailmap); /*where a player that is arrested in this region should be imprisoned. */
180 int ACC (RW, index); 179 int ACC (RW, index);
181 uint32 ACC (RW, counter); /* A generic counter for holding temporary data. */ 180 uint32 ACC (RW, counter); /* A generic counter for holding temporary data. */
182 sint16 ACC (RW, jailx), ACC (RW, jaily); /* The coodinates in jailmap to which the player should be sent. */ 181 sint16 ACC (RW, jailx), ACC (RW, jaily);/* The coodinates in jailmap to which the player should be sent. */
183 bool ACC (RW, fallback); /* whether, in the event of a region not existing, 182 bool ACC (RW, fallback); /* whether, in the event of a region not existing,
184 * this should be the one we fall back on as the default */ 183 * this should be the one we fall back on as the default */
185 184
186 static region *default_region (); 185 static region *default_region ();
187 static region *find (const char *name); 186 static region *find (const char *name);
188 static region *find_fuzzy (const char *name); 187 static region *find_fuzzy (const char *name);
188 static region *read (object_thawer &f);
189}; 189};
190 190
191typedef object_vector<region, &region::index> regionvec; 191typedef object_vector<region, &region::index> regionvec;
192 192
193extern regionvec regions; 193extern regionvec regions;
194 194
195#define for_all_regions(var) \ 195#define for_all_regions(var) \
196 for (int _i = 0; _i < regions.size (); ++_i) \ 196 for (unsigned _i = 0; _i < regions.size (); ++_i) \
197 declvar (region *, var, regions [_i]) 197 declvar (region *, var, regions [_i])
198 198
199struct shopitems : zero_initialised 199struct shopitems : zero_initialised
200{ 200{
201 const char *name; /* name of the item in question, null if it is the default item */ 201 const char *name; /* name of the item in question, null if it is the default item */
… …
354 } 354 }
355 355
356 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP); 356 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP);
357 bool generate_random_map (random_map_params *RP); 357 bool generate_random_map (random_map_params *RP);
358 358
359 static maptile *find_async (const char *path, maptile *original = 0);//PERL
359 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 360 static maptile *find_sync (const char *path, maptile *original = 0);//PERL
360 // async prefetch 361 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL
361 static maptile *find_async (const char *path, maptile *original = 0);//PERL 362 MTH object *pick_random_object () const;
362 363
363 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 364 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
364 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; } 365 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }
365}; 366};
366 367

Diff Legend

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