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.83 by root, Wed Aug 15 04:57:48 2007 UTC vs.
Revision 1.86 by root, Fri Aug 31 00:20:41 2007 UTC

299 299
300 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);
301 301
302 MTH void touch () { last_access = runtime; } 302 MTH void touch () { last_access = runtime; }
303 303
304 MTH bool tile_available (int dir, bool load = true);
305
304 // 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
305 // TODO: need a better way than passing by reference 307 // TODO: need a better way than passing by reference
306 // TODO: make perl interface 308 // TODO: make perl interface
307 maptile *xy_find (sint16 &x, sint16 &y); 309 maptile *xy_find (sint16 &x, sint16 &y);
308 310
319 } 321 }
320 322
321 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);
322 bool generate_random_map (random_map_params *RP); 324 bool generate_random_map (random_map_params *RP);
323 325
324 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
325 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 327 static maptile *find_sync (const char *path, maptile *original = 0);//PERL
326 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
327 MTH object *pick_random_object () const; 329 MTH object *pick_random_object () const;
328 330
329 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]; }
373object::ms () const 375object::ms () const
374{ 376{
375 return map->at (x, y); 377 return map->at (x, y);
376} 378}
377 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
378#endif 435#endif
379 436

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines