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.84 by root, Fri Aug 24 00:26:10 2007 UTC vs.
Revision 1.85 by root, Mon Aug 27 06:29:17 2007 UTC

375object::ms () const 375object::ms () const
376{ 376{
377 return map->at (x, y); 377 return map->at (x, y);
378} 378}
379 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
420inline const mapxy &
421object::operator =(const mapxy &pos)
422{
423 map = pos.m;
424 x = pos.x;
425 y = pos.y;
426
427 return pos;
428}
429
380#endif 430#endif
381 431

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines