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.86 by root, Fri Aug 31 00:20:41 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
… …
211 * be loaded before used. The map,omap and map_ob 212 * be loaded before used. The map,omap and map_ob
212 * arrays will be allocated when the map is loaded */ 213 * arrays will be allocated when the map is loaded */
213 sint16 players; /* How many players are on this map right now */ 214 sint16 players; /* How many players are on this map right now */
214 uint16 ACC (RW, difficulty); /* What level the player should be to play here */ 215 uint16 ACC (RW, difficulty); /* What level the player should be to play here */
215 216
216 bool ACC (RW, active); // wether this map is active or not
217 bool ACC (RW, per_player); 217 bool ACC (RW, per_player);
218 bool ACC (RW, per_party); 218 bool ACC (RW, per_party);
219 bool ACC (RW, outdoor); /* True if an outdoor map */ 219 bool ACC (RW, outdoor); /* True if an outdoor map */
220 bool ACC (RW, nodrop); /* avoid dropping anything on this map */ 220 bool ACC (RW, nodrop); /* avoid dropping anything on this map */
221 uint8 ACC (RW, darkness); /* indicates level of darkness of map */ 221 uint8 ACC (RW, darkness); /* indicates level of darkness of map */
… …
257 MTH int change_map_light (int change); 257 MTH int change_map_light (int change);
258 static void change_all_map_light (int change); //PERL 258 static void change_all_map_light (int change); //PERL
259 MTH void set_darkness_map (); 259 MTH void set_darkness_map ();
260 MTH int estimate_difficulty () const; 260 MTH int estimate_difficulty () const;
261 261
262 MTH void play_sound (faceidx sound, int x, int y) const;
263
262 // set the given flag on all objects in the map 264 // set the given flag on all objects in the map
263 MTH void set_object_flag (int flag, int value = 1); 265 MTH void set_object_flag (int flag, int value = 1);
264 266
265 MTH void link_multipart_objects (); 267 MTH void link_multipart_objects ();
266 MTH void clear_unique_items (); 268 MTH void clear_unique_items ();
… …
296 MTH int size () const { return width * height; } 298 MTH int size () const { return width * height; }
297 299
298 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0); 300 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0);
299 301
300 MTH void touch () { last_access = runtime; } 302 MTH void touch () { last_access = runtime; }
303
304 MTH bool tile_available (int dir, bool load = true);
301 305
302 // find the map that is at coordinate x|y relative to this map 306 // find the map that is at coordinate x|y relative to this map
303 // TODO: need a better way than passing by reference 307 // TODO: need a better way than passing by reference
304 // TODO: make perl interface 308 // TODO: make perl interface
305 maptile *xy_find (sint16 &x, sint16 &y); 309 maptile *xy_find (sint16 &x, sint16 &y);
… …
317 } 321 }
318 322
319 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP); 323 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP);
320 bool generate_random_map (random_map_params *RP); 324 bool generate_random_map (random_map_params *RP);
321 325
322 static maptile *find_async (const char *path, maptile *original = 0);//PERL 326 static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL
323 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 327 static maptile *find_sync (const char *path, maptile *original = 0);//PERL
324 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL 328 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL
325 MTH object *pick_random_object () const; 329 MTH object *pick_random_object () const;
326 330
327 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 331 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
… …
371object::ms () const 375object::ms () const
372{ 376{
373 return map->at (x, y); 377 return map->at (x, y);
374} 378}
375 379
380// not used anywhere *yet*
381struct mapxy {
382 maptile *m;
383 sint16 x, y;
384
385 mapxy (maptile *m, sint16 x, sint16 y)
386 : m(m), x(x), y(y)
387 { }
388
389 mapxy (object *op)
390 : m(op->map), x(op->x), y(op->y)
391 { }
392
393 mapxy &move (int dir)
394 {
395 x += freearr_x [dir];
396 y += freearr_y [dir];
397
398 return *this;
399 }
400
401 operator void *() const { return (void *)m; }
402 mapxy &operator =(const object *op)
403 {
404 m = op->map;
405 x = op->x;
406 y = op->y;
407
408 return *this;
409 }
410
411 mapspace *operator ->() const { return &m->at (x, y); }
412 mapspace *operator * () const { return &m->at (x, y); }
413
414 bool normalise ()
415 {
416 return xy_normalise (m, x, y);
417 }
418
419 object *insert (object *op, object *originator = 0, int flags = 0) const
420 {
421 m->insert (op, x, y, originator, flags);
422 }
423};
424
425inline const mapxy &
426object::operator =(const mapxy &pos)
427{
428 map = pos.m;
429 x = pos.x;
430 y = pos.y;
431
432 return pos;
433}
434
376#endif 435#endif
377 436

Diff Legend

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